Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-backwards-remove
author mpm@selenic.com
Fri, 01 Jul 2005 08:54:52 -0800
changeset 557 b9fee419a1bd
parent 383 4862a134e2c2
child 749 7e4843b7efd2
permissions -rwxr-xr-x
recover: the journal is named 'journal' -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 recover: the journal is named 'journal' spotted by K Thananchayan <thananck@yahoo.com> manifest hash: a2ecfedb3d58011cdf5ef7741ff61aba15aa5885 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxXVbywK+sNU5EO8RAmiBAKCgULQVAZ42xuPRyzb3Rrk794LtaACgoLdF TNtgK/MqF6+EjWNJ5mm2geE= =m5U3 -----END PGP SIGNATURE-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
383
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset 
     1
 
#!/bin/sh -x
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset 
     2
 
hg init
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset 
     3
 
echo This is file a1 > a
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset 
     4
 
hg add a
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset 
     5
 
hg commit -t "commit #0" -d "0 0" -u user
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset 
     6
 
ls
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset 
     7
 
echo This is file b1 > b
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset 
     8
 
hg add b
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset 
     9
 
hg commit -t "commit #1" -d "0 0" -u user
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset 
    10
 
hg co 0
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset 
    11
 
# B should disappear
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset 
    12
 
ls
mercurial-crew-with-dirclash