tests/test-empty-dir
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 23 Jul 2005 17:14:05 +0100
changeset 792 49ec802b4a16
parent 749 7e4843b7efd2
child 800 ec85f9e6f3b1
child 808 8f5637f0a0c0
child 814 0902ffece4b4
permissions -rwxr-xr-x
Added tests for bug with three-way-merging of old tip, tip and cwd.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     1
#!/bin/sh
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     2
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     3
hg init
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     4
echo 123 > a
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     5
hg add a
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 578
diff changeset
     6
hg commit -m "first" -d "0 0" a
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     7
mkdir sub
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     8
echo 321 > sub/b
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
     9
hg add sub/b
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 578
diff changeset
    10
hg commit -m "second" -d "0 0" sub/b
578
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
    11
cat sub/b
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
    12
hg co 0
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
    13
cat sub/b
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
    14
ls sub
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
    15
e33c85d2812a Remove empty directories on update
mpm@selenic.com
parents:
diff changeset
    16
true