Mercurial > public > mercurial-scm > hg

diff tests/test-mq-merge.t @ 14565:3cacc232f27f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: stop updating changed files set in applydiff() This information is more correctly returned by backends. The extra updated file removed from test-mq-merge.t output came from changes from git patches being counted before being really applied in some cases.
author Patrick Mezard <pmezard@gmail.com>
date Sat, 11 Jun 2011 14:14:13 +0200
parents 9510ddf87c43
children 9910f60a37ee
line wrap: on
line diff
--- a/tests/test-mq-merge.t	Sat Jun 11 14:14:11 2011 +0200
+++ b/tests/test-mq-merge.t	Sat Jun 11 14:14:13 2011 +0200
@@ -130,7 +130,7 @@
   patch failed, unable to continue (try -v)
   patch failed, rejects left in working dir
   patch didn't work out, merging patcha
-  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   0 files updated, 2 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
   applying patcha2