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.out
author Bryan O'Sullivan <bos@serpentine.com>
Wed, 20 Jul 2005 03:52:06 -0800
changeset 737 8db4d406b3d3
parent 383 4862a134e2c2
child 749 7e4843b7efd2
permissions -rw-r--r--
Merge with Matt's tip.
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
 
+ hg init
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset 
     2
 
+ echo This is file a1
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset 
     3
 
+ hg add a
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset 
     4
 
+ 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 
     5
 
+ ls
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset 
     6
 
a
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
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
 
+ ls
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset 
    12
 
a
mercurial-crew-with-dirclash