Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge2.out @ 699:64046575a6f7
Removed duplicate use of os.path.normcase().
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Removed duplicate use of os.path.normcase().
manifest hash: cccacfb66a4de9abc20095b28e6bab9b51dc4fa9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC1n0LW7P1GVgWeRoRAueGAJ9256Jiwv4QbrFIV3Px/SmBMkddjQCbBop/
J2Yi2np72OAKVPhFhCijH6s=
=aAyf
-----END PGP SIGNATURE-----
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Thu, 14 Jul 2005 15:56:11 +0100 |
| 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