Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4.out @ 531:0e9234a1a3f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Hashing speed-up -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hashing speed-up - From Chris Mason manifest hash: c10091676647015b907a3ddce4dc629cb485de36 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxCFmywK+sNU5EO8RAjiEAJ98eBaomWIUtT7DAm5dCbcAOe1I7gCdFl/E AvepXnn+tLC2Grk9et2sL3M= =spZz -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 30 Jun 2005 08:44:22 -0800
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