Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-symlinks @ 5429:77cafe8f89e0
findcopies: fix rename bug
We've fiddled with this line several times, and an old bug has
reappeared from it. Let's take a peek at the history.
The original "or" (rev 3674, in 0.9.2 and 0.9.3):
http://www.selenic.com/hg/rev/9103dab96093
Then I changed it to an "and" to fix a bug (rev 4304):
http://www.selenic.com/hg/rev/4787e2b0dd03
Then for reasons now lost in the mists of time, I dropped half (rev 4399):
http://www.selenic.com/hg/rev/93652499bed3
Then we added back the "or" (rev 4416, in 0.9.4):
http://www.selenic.com/hg/rev/bb1800a7d7e1
So it seems it ought to be "and".
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Oct 2007 18:47:22 -0500 |
parents | 36794dbe66a3 |
children |
line wrap: on
line source
#!/bin/sh cat > echo.py <<EOF #!/usr/bin/env python import os 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