| commit | 83f303f598a5eb007c365a56b9e44fc666da6d22 | [log] [tgz] |
|---|---|---|
| author | Dave Borowitz <dborowitz@google.com> | Mon Jun 23 18:36:59 2014 -0700 |
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | Tue Jun 24 01:44:08 2014 +0000 |
| tree | 8df582e721a78d32554c70e97a09602f1fbc58de | |
| parent | aec45cf82c287cb26b6cc85fcc03c3bacabfb08e [diff] |
PatchListLoader: don't swallow exception in automerge Change-Id: I459e0ae398ebb4890b0d4722572db04d8a379ce3
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java index d4131b0..4eede00 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java
@@ -293,6 +293,7 @@ // an exception most likely means that the merge tree was not created // and m.getMergeResults() is empty. This would mean that all paths are // unmerged and Gerrit UI would show all paths in the patch list. + log.warn("Error attempting automerge " + refName, e); return null; }