tests/test-merge2.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 28 Jun 2005 07:05:55 +0100
changeset 494 6020bde714e4
parent 409 feadc9697b43
child 749 7e4843b7efd2
permissions -rw-r--r--
Fixed test for previous change of 'hg -v history'. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fixed test for previous change of 'hg -v history'. manifest hash: 5a7d918645596751577b95d0dfba28fd70274b48 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCwOjDW7P1GVgWeRoRAvL7AJwO27B6qhOZZC+16SPjIxJBKz3BSwCghmkB OMzLY0CjZSHixF5xs0ZU6Dw= =F04F -----END PGP SIGNATURE-----

+ 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
+ rm b
+ hg update 0
+ echo This is file b2
+ hg add b
+ hg commit -t 'commit #2' -d '0 0' -u user
+ 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
+ rm b
+ hg update 0
+ echo This is file b2
+ hg commit -A -t 'commit #2' -d '0 0' -u user
+ 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
+ rm b
+ hg remove b
+ hg update 0
+ echo This is file b2
+ hg commit -A -t 'commit #2' -d '0 0' -u user
+ cd ..
+ /bin/rm -rf t