tests/test-merge4.out
author mpm@selenic.com
Sat, 02 Jul 2005 18:25:15 -0800
changeset 579 ffeb2c3a1966
parent 416 5e9e8b8d2629
child 749 7e4843b7efd2
permissions -rw-r--r--
Actually warn on pulling from an unrelated repository -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Actually warn on pulling from an unrelated repository add some comments to findincoming track the base nodes of the fetch set report if the base set only contains nullid add a test case manifest hash: 3fc038a6041b0967a20503f5ec8876efc038841a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx0yLywK+sNU5EO8RAlK6AJ9J/GKPpYSMzTqmguXPWOISJ+zY5gCghd+j ClLpn0dKZnB46dh0F8zhuuk= =emNb -----END PGP SIGNATURE-----

+ 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
+ hg update -m 1
+ rm b
+ echo This is file c22
+ hg commit -t 'commit #3' -d '0 0' -u user