Mercurial > hg
view tests/test-merge-symlinks @ 8810:ac92775b3b80
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.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 15 Jun 2009 00:03:26 +0200 |
parents | a6477aa893b8 |
children |
line wrap: on
line source
#!/bin/sh cat > echo.py <<EOF #!/usr/bin/env python import os, sys try: import msvcrt msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY) msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY) except ImportError: pass for k in ('HG_FILE', 'HG_MY_ISLINK', 'HG_OTHER_ISLINK', 'HG_BASE_ISLINK'): print k, os.environ[k] EOF # Create 2 heads containing the same file, once as # a file, once as a link. Bundle was generated with: # # hg init t # cd t # echo a > a # hg ci -qAm t0 -d '0 0' # echo l > l # hg ci -qAm t1 -d '1 0' # hg up -C 0 # ln -s a l # hg ci -qAm t2 -d '2 0' # echo l2 > l2 # hg ci -qAm t3 -d '3 0' hg init t cd t hg -q pull "$TESTDIR/test-merge-symlinks.hg" hg up -C 3 # Merge them and display *_ISLINK vars echo % merge heads HGMERGE="python ../echo.py" hg merge # Test working directory symlink bit calculation wrt copies, # especially on non-supporting systems. echo % merge working directory hg up -C 2 hg copy l l2 HGMERGE="python ../echo.py" hg up 3