Mercurial > hg-stable

diff tests/test-histedit-fold-non-commute.t @ 27405:5837ca674da9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
histedit: omit useless message from update (histeditaction) specifically: 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
author timeless <timeless@mozdev.org>
date Mon, 14 Dec 2015 21:43:16 +0000
parents ef1eb6df7071
children 11be6b7f95da
line wrap: on
line diff
--- a/tests/test-histedit-fold-non-commute.t	Mon Dec 14 23:14:06 2015 +0000
+++ b/tests/test-histedit-fold-non-commute.t	Mon Dec 14 21:43:16 2015 +0000
@@ -120,7 +120,6 @@
   
   
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
@@ -132,7 +131,6 @@
   $ 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
 
 log after edit
   $ hg log --graph
@@ -261,7 +259,6 @@
   $ hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed'
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   Fix up the change and run hg histedit --continue
@@ -273,7 +270,6 @@
   $ 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
 
 log after edit
   $ hg log --graph