Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-convert-hg-source @ 5280:11e1e574da02
convert: mercurial_source: also search for copies in modified files
There are some corner cases where we may have a copy in a file that
isn't in the added list:
- the result of a hg copy --after --force
- after a merge across a (local) rename
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Sat, 01 Sep 2007 02:49:18 -0300 |
| parents | |
| children | 22ddde515fda |
comparison
equal
deleted
inserted
replaced
| 5279:2dbd750b3ddd | 5280:11e1e574da02 |
|---|---|
| 1 #!/bin/sh | |
| 2 | |
| 3 echo "[extensions]" >> $HGRCPATH | |
| 4 echo "hgext.convert=" >> $HGRCPATH | |
| 5 | |
| 6 hg init orig | |
| 7 cd orig | |
| 8 | |
| 9 echo foo > foo | |
| 10 echo bar > bar | |
| 11 hg ci -qAm 'add foo bar' -d '0 0' | |
| 12 | |
| 13 echo >> foo | |
| 14 hg ci -m 'change foo' | |
| 15 | |
| 16 hg up -qC 0 | |
| 17 hg copy --after --force foo bar | |
| 18 hg copy foo baz | |
| 19 hg ci -m 'make bar and baz copies of foo' -d '1 0' | |
| 20 | |
| 21 hg merge | |
| 22 hg ci -m 'merge local copy' -d '2 0' | |
| 23 | |
| 24 hg up -C 1 | |
| 25 hg merge 2 | |
| 26 hg ci -m 'merge remote copy' -d '3 0' | |
| 27 | |
| 28 cd .. | |
| 29 hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' | |
| 30 cd new | |
| 31 hg out ../orig | |
| 32 | |
| 33 true |