Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 543:61ead26cb8f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated TODO -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Updated TODO manifest hash: 007f50cbf11632362229853439d2610a1ad3f989 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCxF+7W7P1GVgWeRoRAg8MAJ9k3HXkpmHk3SRYw9FiqfHh8sEDFQCfc5il 2T+hyWgBwBTTHYpBeujq/20= =cRVv -----END PGP SIGNATURE-----
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 30 Jun 2005 22:10:19 +0100
parents 5e9e8b8d2629
children 7e4843b7efd2
line wrap: on
line source

+ 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