Mercurial > public > mercurial-scm > hg

diff tests/test-merge-types @ 5701:32c2832682a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add --debug to test-merge-types
author Matt Mackall <mpm@selenic.com>
date Thu, 27 Dec 2007 22:27:43 -0600
parents 57d29a45ffbc
children 026eb80060d8
line wrap: on
line diff
--- a/tests/test-merge-types	Thu Dec 27 22:27:37 2007 -0600
+++ b/tests/test-merge-types	Thu Dec 27 22:27:43 2007 -0600
@@ -2,19 +2,18 @@
 
 hg init
 echo a > a
-hg ci -Amadd
+hg ci -Amadd       # 0
 
 chmod +x a
-hg ci -mexecutable
+hg ci -mexecutable # 1
 
 hg up 0
 rm a
 ln -s symlink a
-hg ci -msymlink
+hg ci -msymlink    # 2
+hg merge --debug
 
-hg merge
-
-echo % symlink is left parent, executable is right
+echo % symlink is local parent, executable is other
 
 if [ -h a ]; then
     echo a is a symlink
@@ -24,9 +23,9 @@
 fi
 
 hg update -C 1
-hg merge
+hg merge --debug
 
-echo % symlink is right parent, executable is left
+echo % symlink is other parent, executable is local
 
 if [ -h a ]; then
     echo a is a symlink