Mercurial > hg-stable

changeset 17688:f4bed9b57858

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Thu, 27 Sep 2012 01:53:28 +0200
parents 8853f37b1e62
children aa0647830fd9
files tests/test-histedit-non-commute.t
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-histedit-non-commute.t	Mon Sep 24 15:46:01 2012 +0200
+++ b/tests/test-histedit-non-commute.t	Thu Sep 27 01:53:28 2012 +0200
@@ -162,6 +162,9 @@
   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