Mercurial > public > mercurial-scm > hg-stable
diff tests/test-histedit-non-commute.t @ 27627:dcbba68e076f
histedit: hook afterresolvedstates
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 24 Dec 2015 20:41:17 +0000 |
| parents | 11be6b7f95da |
| children | e7ff83b2bcfe |
line wrap: on
line diff
--- a/tests/test-histedit-non-commute.t Thu Dec 24 20:41:40 2015 +0000 +++ b/tests/test-histedit-non-commute.t Thu Dec 24 20:41:17 2015 +0000 @@ -153,6 +153,7 @@ $ echo 'I can haz no commute' > e $ hg resolve --mark e (no more unresolved files) + continue: hg histedit --continue $ hg histedit --continue 2>&1 | fixbundle merging e warning: conflicts while merging e! (edit, then use 'hg resolve --mark') @@ -165,6 +166,7 @@ $ hg revert -r 'p1()' e $ hg resolve --mark e (no more unresolved files) + continue: hg histedit --continue $ hg histedit --continue 2>&1 | fixbundle 7b4e2f4b7bcd: empty changeset @@ -236,6 +238,7 @@ $ echo 'I can haz no commute' > e $ hg resolve --mark e (no more unresolved files) + continue: hg histedit --continue $ hg histedit --continue 2>&1 | fixbundle merging e warning: conflicts while merging e! (edit, then use 'hg resolve --mark') @@ -244,6 +247,7 @@ $ hg revert -r 'p1()' e $ hg resolve --mark e (no more unresolved files) + continue: hg histedit --continue $ hg histedit --continue 2>&1 | fixbundle 7b4e2f4b7bcd: empty changeset