--- a/tests/test-histedit-commute.t Mon Dec 14 21:43:16 2015 +0000
+++ b/tests/test-histedit-commute.t Mon Dec 14 22:37:31 2015 +0000
@@ -71,7 +71,6 @@
# d, drop = remove commit from history
# m, mess = edit commit message without changing commit content
#
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
edit the history
(use a hacky editor to check histedit-last-edit.txt backup)
@@ -85,7 +84,6 @@
> EOF
$ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
rules should end up in .hg/histedit-last-edit.txt:
$ cat .hg/histedit-last-edit.txt
@@ -137,7 +135,6 @@
> pick 8ade9693061e f
> EOF
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log --graph
@ changeset: 5:7eca9b5b1148
@@ -181,7 +178,6 @@
> pick 177f92b77385 c
> EOF
0 files updated, 0 files merged, 4 files removed, 0 files unresolved
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log --graph
@ changeset: 5:38b92f448761
| tag: tip
@@ -223,7 +219,6 @@
> pick de71b079d9ce e
> EOF
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log --graph
@ changeset: 7:803ef1c6fcfd
| tag: tip
@@ -341,7 +336,6 @@
# d, drop = remove commit from history
# m, mess = edit commit message without changing commit content
#
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
should also work if a commit message is missing
$ BUNDLE="$TESTDIR/missing-comment.hg"
@@ -372,7 +366,6 @@
summary: Checked in text file
$ hg histedit 0
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ..
$ cd ..
@@ -413,7 +406,6 @@
removing initial-dir/initial-file (glob)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob)
saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob)