tests/test-backwards-remove.out
author mpm@selenic.com
Sat, 30 Jul 2005 08:35:29 -0800
changeset 808 8f5637f0a0c0
parent 749 7e4843b7efd2
parent 801 1f9ec150a476
child 814 0902ffece4b4
permissions -rw-r--r--
Merge with TAH
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
+ hg add a
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset
     3
+ hg commit -m commit #0 -d 0 0
383
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset
     4
a
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset
     5
+ hg add b
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 749
diff changeset
     6
+ hg commit -m commit #1 -d 0 0
383
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset
     7
+ hg co 0
4862a134e2c2 hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff changeset
     8
a