changeset 940:9ad288b299ea

More reliable 'abandoned transaction' error detection
author Dmitry Neverov <dmitry.neverov@gmail.com>
date Thu, 10 Dec 2015 17:34:02 +0100
parents 7528d38018b1
children 3a0adb764580
files mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandResult.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandResult.java	Wed Dec 09 13:07:03 2015 +0100
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/command/CommandResult.java	Thu Dec 10 17:34:02 2015 +0100
@@ -270,7 +270,7 @@
   }
 
   private void checkAbandonedTransaction(@NotNull final String stderr) throws AbandonedTransactionFound {
-    if (stderr.contains("abort: abandoned transaction found - run hg recover"))
+    if (stderr.contains("abort: abandoned transaction found") && stderr.contains("hg recover"))
       throw new AbandonedTransactionFound();
   }