Mercurial > hg
view tests/test-merge1.out @ 591:eb46971fc57f
options: kill -d for debug
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
options: kill -d for debug
You must now use --debug.
This is a preparatory step for changing the option parsing from:
hg [global-opts] <command> [command-opts]
to
hg [global-opts] <command> [global or command opts]
manifest hash: ec5ecc687340baa109a98b742f1cd8d1f4aadeed
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCx4urywK+sNU5EO8RAl90AJ0fwKU/GwHpJvlTFl5naeJbkceWewCgh4jK
kaTSSodACgPzgbFiid5RL4Y=
=siEe
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sat, 02 Jul 2005 22:54:35 -0800 |
parents | 5b22029b5aa2 |
children | 7e4843b7efd2 |
line wrap: on
line source
+ cat + chmod +x merge + mkdir t + cd t + hg init + echo This is file a1 + hg add a + hg commit -t 'commit #0' -d '0 0' -u user + echo This is file b1 + hg add b + hg commit -t 'commit #1' -d '0 0' -u user + hg update 0 + echo This is file c1 + hg add c + hg commit -t 'commit #2' -d '0 0' -u user + echo This is file b1 + env HGMERGE=../merge hg update -m 1 + cd .. + /bin/rm -rf t + mkdir t + cd t + hg init + echo This is file a1 + hg add a + hg commit -t 'commit #0' -d '0 0' -u user + echo This is file b1 + hg add b + hg commit -t 'commit #1' -d '0 0' -u user + hg update 0 + echo This is file c1 + hg add c + hg commit -t 'commit #2' -d '0 0' -u user + echo This is file b2 + env HGMERGE=../merge hg update -m 1 merging for b merging b + cd .. + /bin/rm -rf t + mkdir t + cd t + hg init + echo This is file a1 + hg add a + hg commit -t 'commit #0' -d '0 0' -u user + echo This is file b1 + hg add b + hg commit -t 'commit #1' -d '0 0' -u user + echo This is file b22 + hg commit -t 'commit #2' -d '0 0' -u user + hg update 1 + echo This is file c1 + hg add c + hg commit -t 'commit #3' -d '0 0' -u user + cat b This is file b1 + echo This is file b22 + env HGMERGE=../merge hg update -m 2 merging for b merging b + cd .. + /bin/rm -rf t + mkdir t + cd t + hg init + echo This is file a1 + hg add a + hg commit -t 'commit #0' -d '0 0' -u user + echo This is file b1 + hg add b + hg commit -t 'commit #1' -d '0 0' -u user + echo This is file b22 + hg commit -t 'commit #2' -d '0 0' -u user + hg update 1 + echo This is file c1 + hg add c + hg commit -t 'commit #3' -d '0 0' -u user + echo This is file b33 + env HGMERGE=../merge hg update -m 2 merging for b merging b + cd .. + /bin/rm -rf t