tests/test-empty-dir
author Patrick Mezard <pmezard@gmail.com>
Mon, 15 Jun 2009 00:03:26 +0200
changeset 8810 ac92775b3b80
parent 3469 33b6c8193652
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
Add patch.eol to ignore EOLs when patching (issue1019) The intent is to fix many issues involving patching when win32ext is enabled. With win32ext, the working directory and repository files EOLs are not the same which means that patches made on a non-win32ext host do not apply cleanly because of EOLs discrepancies. A theorically correct approach would be transform either the patched file or the patch content with the encoding/decoding filters used by win32ext. This solution is tricky to implement and invasive, instead we prefer to address the win32ext case, by offering a way to ignore input EOLs when patching and rewriting them when saving the patched result.
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
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1926
diff changeset
     6
hg commit -m "first" -d "1000000 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
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1926
diff changeset
    10
hg commit -m "second" -d "1000000 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
1926
ba198d17eea9 changes by John Levon to standardize some erroroutput
Peter van Dijk <peter@dataloss.nl>
parents: 814
diff changeset
    13
cat sub/b 2>/dev/null || echo "sub/b not present"
3469
33b6c8193652 Don't use test -e in tests - sh doesn't like it on Solaris
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3428
diff changeset
    14
test -d sub || echo "sub not present"
578
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