Mercurial > public > mercurial-scm > hg

diff tests/test-rename-merge1 @ 3251:c93ce7f10f85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fixes for merge+rename findcopies: ignore files renamed on both branches applyupdates: change remove flag to move recordupdates: record copy actions, including local moves and deletions
author Matt Mackall <mpm@selenic.com>
date Wed, 04 Oct 2006 19:08:04 -0500
parents c82ea81d6850
children 764688cf51e5
line wrap: on
line diff
--- a/tests/test-rename-merge1	Wed Oct 04 17:59:27 2006 -0500
+++ b/tests/test-rename-merge1	Wed Oct 04 19:08:04 2006 -0500
@@ -3,6 +3,8 @@
 mkdir t
 cd t
 hg init
+echo "[merge]" >> .hg/hgrc
+echo "followcopies = 1" >> .hg/hgrc
 echo foo > a
 echo foo > a2
 hg add a a2
@@ -18,6 +20,6 @@
 hg ci -m "modify" -d "0 0"
 echo "merge"
 hg merge -y --debug
-cat a
+hg status -AC
 cat b
 hg ci -m "merge" -d "0 0"