##// END OF EJS Templates
copies: don't report copies with unrelated branch
copies: don't report copies with unrelated branch

File last commit:

r10130:7936cd26 default
r10179:83cfa1ba stable
Show More
test-import-eol
54 lines | 1.2 KiB | text/plain | TextLexer
Patrick Mezard
Add patch.eol to ignore EOLs when patching (issue1019)...
r8810 #!/bin/sh
cat > makepatch.py <<EOF
f = file('eol.diff', 'wb')
w = f.write
w('test message\n')
w('diff --git a/a b/a\n')
w('--- a/a\n')
w('+++ b/a\n')
w('@@ -1,5 +1,5 @@\n')
w(' a\n')
Colin Caughie
Fixed patch.eol bug that truncated all patched lines to one character...
r8817 w('-bbb\r\n')
w('+yyyy\r\n')
w(' cc\r\n')
w(' \n')
Patrick Mezard
Add patch.eol to ignore EOLs when patching (issue1019)...
r8810 w(' d\n')
w('-e\n')
w('\ No newline at end of file\n')
w('+z\r\n')
w('\ No newline at end of file\r\n')
EOF
hg init repo
cd repo
echo '\.diff' > .hgignore
# Test different --eol values
Colin Caughie
Fixed patch.eol bug that truncated all patched lines to one character...
r8817 python -c 'file("a", "wb").write("a\nbbb\ncc\n\nd\ne")'
Patrick Mezard
Add patch.eol to ignore EOLs when patching (issue1019)...
r8810 hg ci -Am adda
python ../makepatch.py
echo % invalid eol
hg --config patch.eol='LFCR' import eol.diff
hg revert -a
echo % force LF
hg --traceback --config patch.eol='LF' import eol.diff
python -c 'print repr(file("a","rb").read())'
hg st
echo % force CRLF
hg up -C 0
hg --traceback --config patch.eol='CRLF' import eol.diff
python -c 'print repr(file("a","rb").read())'
hg st
# Test --eol and binary patches
python -c 'file("b", "wb").write("a\x00\nb")'
hg ci -Am addb
python -c 'file("b", "wb").write("a\x00\nc")'
hg diff --git > bin.diff
hg revert --no-backup b
echo % binary patch with --eol
hg import --config patch.eol='CRLF' -m changeb bin.diff
python -c 'print repr(file("b","rb").read())'
hg st
cd ..