Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge1 @ 430:5b22029b5aa2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up test-merge1 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix up test-merge1 The third test was wrong and showed up after fixing the typo in compare code manifest hash: 306ab9936457ad90e7c7a226d6407ca586262650 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuPH8ywK+sNU5EO8RAql+AJsH/bxFMTMbUiaEoLNhXS6wNkzLAgCfQxDJ 3j5pZ3MzrtPD0y4wC3vIAA4= =VKEy -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 21 Jun 2005 21:07:08 -0800
parents 0e0d0670b2bc
children 7e4843b7efd2
comparison
equal deleted inserted replaced
429:688d03d6997a 430:5b22029b5aa2
57 hg commit -t "commit #2" -d "0 0" -u user 57 hg commit -t "commit #2" -d "0 0" -u user
58 hg update 1 58 hg update 1
59 echo This is file c1 > c 59 echo This is file c1 > c
60 hg add c 60 hg add c
61 hg commit -t "commit #3" -d "0 0" -u user 61 hg commit -t "commit #3" -d "0 0" -u user
62 cat b
62 echo This is file b22 > b 63 echo This is file b22 > b
63 env HGMERGE=../merge hg update -m 2 64 env HGMERGE=../merge hg update -m 2
64 # no merges expected 65 # merge expected!
65 cd ..; /bin/rm -rf t 66 cd ..; /bin/rm -rf t
66 67
67 mkdir t 68 mkdir t
68 cd t 69 cd t
69 hg init 70 hg init