Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge2.out @ 462:512d76558bd4
Fix pipe timing for copy test
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix pipe timing for copy test
manifest hash: 75c389c84f4edacdd9163b6e5234f3ea334ca4b3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCvQEDywK+sNU5EO8RAtGDAJ0QKBXRg8qQ/Vkye9xEatVUREtU1ACcCISd
cJDQzk62ukLW2/gcCLOHHMQ=
=tpar
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 24 Jun 2005 23:00:19 -0800 |
parents | feadc9697b43 |
children | 7e4843b7efd2 |
line wrap: on
line source
+ 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