Mercurial > hg
view tests/test-hgignore @ 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 | ac97e065cfc7 |
children | 31abcae33b4f |
line wrap: on
line source
#!/bin/sh hg init # Test issue 562: .hgignore requires newline at end touch foo touch bar touch baz cat > makeignore.py <<EOF f = open(".hgignore", "w") f.write("ignore\n") f.write("foo\n") # No EOL here f.write("bar") f.close() EOF python makeignore.py echo % should display baz only hg status rm foo bar baz .hgignore makeignore.py touch a.o touch a.c touch syntax mkdir dir touch dir/a.o touch dir/b.o touch dir/c.o hg add dir/a.o hg commit -m 0 hg add dir/b.o echo "--" ; hg status echo "*.o" > .hgignore echo "--" ; hg status 2>&1 | sed -e 's/abort: .*\.hgignore:/abort: .hgignore:/' echo ".*\.o" > .hgignore echo "--" ; hg status echo "glob:**.o" > .hgignore echo "--" ; hg status echo "glob:*.o" > .hgignore echo "--" ; hg status echo "syntax: glob" > .hgignore echo "re:.*\.o" >> .hgignore echo "--" ; hg status echo "syntax: invalid" > .hgignore echo "--" ; hg status 2>&1 | sed -e 's/.*\.hgignore:/.hgignore:/' echo "syntax: glob" > .hgignore echo "*.o" >> .hgignore echo "--" ; hg status echo "relglob:syntax*" > .hgignore echo "--" ; hg status echo "relglob:*" > .hgignore echo "--" ; hg status cd dir echo "--" ; hg status .