tests/test-backwards-remove.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 29 Jul 2005 15:19:43 +0100
changeset 800 ec85f9e6f3b1
parent 749 7e4843b7efd2
child 801 1f9ec150a476
child 808 8f5637f0a0c0
child 814 0902ffece4b4
permissions -rw-r--r--
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
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
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 383
diff changeset
     4
+ 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
     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
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 383
diff changeset
     9
+ 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
    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