Mercurial > hg
view tests/test-walk @ 5096:ad6b97132b81
merge: fix a copy detection bug (issue672)
When merging rev1 and rev2, we want to search for copies that happened
in rev1 but not in rev2 and vice-versa. We were starting the search at
rev1/rev2 and then going back, stopping as soon as we reached the revno
of the ancestor, but that can miss some cases (see the new
test-issue672).
Now we calculate the revisions that are ancestors of rev1 or rev2 (but
not both) and make sure the search doesn't stop too early.
Simplified test provided by mpm, based on a test case provided by
Edward Lee.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sun, 12 Aug 2007 12:15:10 -0300 |
parents | d4f0405fadac |
children | 48d01b1e315f b41f0d6a74fc |
line wrap: on
line source
#!/bin/sh debugwalk() { echo "hg debugwalk $@" hg debugwalk "$@" echo } chdir() { echo "cd $@" cd "$@" echo } mkdir t cd t hg init mkdir -p beans for b in kidney navy turtle borlotti black pinto; do echo $b > beans/$b done mkdir -p mammals/Procyonidae for m in cacomistle coatimundi raccoon; do echo $m > mammals/Procyonidae/$m done echo skunk > mammals/skunk echo fennel > fennel echo fenugreek > fenugreek echo fiddlehead > fiddlehead echo glob:glob > glob:glob hg addremove hg commit -m "commit #0" -d "1000000 0" debugwalk debugwalk -I. chdir mammals debugwalk debugwalk -X ../beans debugwalk -I '*k' debugwalk -I 'glob:*k' debugwalk -I 'relglob:*k' debugwalk -I 'relglob:*k' . debugwalk -I 're:.*k$' debugwalk -I 'relre:.*k$' debugwalk -I 'path:beans' debugwalk -I 'relpath:../beans' debugwalk . debugwalk -I. debugwalk Procyonidae chdir Procyonidae debugwalk . debugwalk .. chdir .. debugwalk ../beans debugwalk . debugwalk .hg debugwalk ../.hg chdir .. debugwalk -Ibeans debugwalk 'glob:mammals/../beans/b*' debugwalk '-X*/Procyonidae' mammals debugwalk path:mammals debugwalk .. debugwalk beans/../.. debugwalk .hg debugwalk beans/../.hg debugwalk beans/../.hg/data debugwalk beans/.hg # Don't know how to test absolute paths without always getting a false # error. #debugwalk `pwd`/beans #debugwalk `pwd`/.. debugwalk glob:\* debugwalk 'glob:**e' debugwalk 're:.*[kb]$' debugwalk path:beans/black debugwalk path:beans//black debugwalk relglob:Procyonidae debugwalk 'relglob:Procyonidae/**' debugwalk 'relglob:Procyonidae/**' fennel debugwalk beans 'glob:beans/*' debugwalk 'glob:mamm**' debugwalk 'glob:mamm**' fennel debugwalk 'glob:j*' debugwalk NOEXIST mkfifo fifo debugwalk fifo rm fenugreek debugwalk fenugreek hg rm fenugreek debugwalk fenugreek touch new debugwalk new chdir .. debugwalk -R t t/mammals/skunk mkdir t2 chdir t2 debugwalk -R ../t ../t/mammals/skunk debugwalk --cwd ../t mammals/skunk