tests/test-merge4.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 15 Jul 2005 12:06:29 +0100
changeset 710 ca9353f43345
parent 416 5e9e8b8d2629
child 749 7e4843b7efd2
permissions -rw-r--r--
Use dirstate to check if .hgtags needs to be added. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Use dirstate to check if .hgtags needs to be added. manifest hash: f90af1553754eb703fc457ffdd5ded0de6fa47e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFC15i1W7P1GVgWeRoRArDvAKCSxWDCbwU12ICwwVUoe753H8GYIwCfZGs0 HcL8cOp+eHz85AMJJE/xfck= =1xKK -----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