// Can't decide whether unmerged paths exists. Return
// MERGING state to be on the safe side (in state MERGING
// you are not allow to do anything)
- e.printStackTrace();
}
return RepositoryState.MERGING;
}
}
} catch (IOException e) {
// fall through to CHERRY_PICKING
- e.printStackTrace();
}
return RepositoryState.CHERRY_PICKING;
public void run() {
try {
dc.execute(s);
- } catch (RepositoryNotFoundException e) {
- // Ignored. Client cannot use this repository.
} catch (ServiceNotEnabledException e) {
// Ignored. Client cannot use this repository.
} catch (ServiceNotAuthorizedException e) {
// Ignored. Client cannot use this repository.
} catch (IOException e) {
// Ignore unexpected IO exceptions from clients
- e.printStackTrace();
} finally {
try {
s.getInputStream().close();