Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-fetch @ 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 | 61fcd9fac434 |
children |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "fetch=" >> $HGRCPATH hg init a echo a > a/a hg --cwd a commit -d '1 0' -Ama hg clone a b hg clone a c echo b > a/b hg --cwd a commit -d '2 0' -Amb hg --cwd a parents -q echo % should pull one change hg --cwd b fetch ../a hg --cwd b parents -q echo c > c/c hg --cwd c commit -d '3 0' -Amc hg --cwd c fetch -d '4 0' -m 'automated merge' ../a ls c