[PATCH 08 of 12] histedit-test: clarify the reason of a failure

pierre-yves.david at logilab.fr pierre-yves.david at logilab.fr
Thu Sep 27 07:23:27 CDT 2012

# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1348703608 -7200
# Node ID 251703b8c50824bbc53e01baf773505cf3ef9943
# Parent  f1dd19506be86d90a79df24ffa214a91ce0abe7b
histedit-test: clarify the reason of a failure

There is multiple conflict during this test. This add a small comment that
highligh the reason of a particular failure.

diff --git a/tests/test-histedit-non-commute.t b/tests/test-histedit-non-commute.t
--- a/tests/test-histedit-non-commute.t
+++ b/tests/test-histedit-non-commute.t
@@ -160,10 +160,13 @@ fix up
   merging e
   warning: conflicts during merge.
   merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
   abort: Fix up the change and run hg histedit --continue
+This failure is caused by 7b4e2f4b7bcd "e" not rebasing the non commutative
+former children.
 just continue this time
   $ hg revert -r 'p1()' e
   $ hg resolve --mark e
   $ hg histedit --continue 2>&1 | fixbundle
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

More information about the Mercurial-devel mailing list