Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge3 @ 4679:826659bd8053
git patches: correct handling of filenames with spaces
Add a trailing TAB to the "--- filename" lines if there's a space
in the file name. This allows patch(1) to work correctly. The
same is done for diff --nodates.
This was originally suggested by Andrei Vermel, but at the time
I thought git was doing something different.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Fri, 22 Jun 2007 19:06:04 -0300 |
| parents | 7544700fd931 |
| children |
| rev | line source |
|---|---|
|
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
1 #!/bin/sh |
| 402 | 2 |
| 3 hg init | |
| 4 echo This is file a1 > a | |
| 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:
814
diff
changeset
|
6 hg commit -m "commit #0" -d "1000000 0" |
| 402 | 7 touch b |
| 8 hg add b | |
| 9 rm b | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
10 hg commit -A -m"comment #1" -d "1000000 0" |