# HG changeset patch # User Pierre-Yves David # Date 1348703608 -7200 # Node ID f4bed9b5785857a45ec34951e0302ad0908aa770 # Parent 8853f37b1e62e45cd1c655cc339162eb29f702b6 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 -r 8853f37b1e62 -r f4bed9b57858 tests/test-histedit-non-commute.t --- 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