comparison tests/test-backwards-remove.out @ 383:4862a134e2c2

hg merge: fix time asymmetry bug with deleting files on update to past -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg merge: fix time asymmetry bug with deleting files on update to past manifest hash: 41feb7bf9b56e071a538a0918224898acb2bd31c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsm6XywK+sNU5EO8RAncbAKCwn/W4cr6civp4Zt79JFH6um0/lQCdFCh8 F7ZOQ+S/PL3HL4iE6avOBDc= =kHPm -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 16 Jun 2005 22:32:55 -0800
parents
children 7e4843b7efd2
comparison
equal deleted inserted replaced
382:37249c522770 383:4862a134e2c2
1 + hg init
2 + echo This is file a1
3 + hg add a
4 + hg commit -t 'commit #0' -d '0 0' -u user
5 + ls
6 a
7 + echo This is file b1
8 + hg add b
9 + hg commit -t 'commit #1' -d '0 0' -u user
10 + hg co 0
11 + ls
12 a