changeset 17688 | f4bed9b57858 |
parent 17647 | d34ba4991188 |
child 18437 | 358c23e8f1c6 |
--- 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