Mercurial > hg

diff tests/test-histedit-non-commute.t @ 24767:477e76936b1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: convert pick action into a class This converts the pick action into a histeditclass instance, as part of an ongoing effort to refactor histedit for maintainability and robustness. The test output changed because previously pick would only report the commit disappearing if there were no merge conflicts. Now that we've unified the normal and the --continue flows, they act the same and we get the warning even after --continue.
author Durham Goode <durham@fb.com>
date Sat, 04 Apr 2015 11:39:08 -0700
parents b081decd9062
children ef1eb6df7071
line wrap: on
line diff
--- a/tests/test-histedit-non-commute.t	Sat Apr 04 11:37:08 2015 -0700
+++ b/tests/test-histedit-non-commute.t	Sat Apr 04 11:39:08 2015 -0700
@@ -170,6 +170,7 @@
   $ hg resolve --mark e
   (no more unresolved files)
   $ hg histedit --continue 2>&1 | fixbundle
+  7b4e2f4b7bcd: empty changeset
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
@@ -253,6 +254,7 @@
   $ hg resolve --mark e
   (no more unresolved files)
   $ hg histedit --continue 2>&1 | fixbundle
+  7b4e2f4b7bcd: empty changeset
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved