Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge2.out @ 711:734712f37de3
Show filename for hg export in verbose mode.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Show filename for hg export in verbose mode.
manifest hash: 4fbb7bb566ef04e64079fb1fd61974ad47f22e7c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC15svW7P1GVgWeRoRAleQAJ4kXmyj+56kTb5lV9VrQYpu4O3h5ACfXU5W
M0TB/OvU0g5uvudZVQMsJd0=
=yq7Y
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 15 Jul 2005 12:17:03 +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