Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-demandimport.out @ 5149: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 | e3afa670e484 |
| children |
line wrap: on
line source
os = <unloaded module 'os'> os.system = <built-in function system> os = <module 'os' from '?'> mercurial.version = <unloaded module 'version'> mercurial.version.get_version = <function get_version at 0x?> mercurial.version = <module 'mercurial.version' from '?'> mercurial = <module 'mercurial' from '?'> util = <unloaded module 'util'> util.system = <function system at 0x?> util = <module 'mercurial.util' from '?'> util.system = <function system at 0x?> fred = <unloaded module 're'> re = <unloaded module 'sys'> fred = <unloaded module 're'> fred.sub = <function sub at 0x?> fred = <proxied module 're'> re = <unloaded module 'sys'> re.stdout = <open file '<stdout>', mode 'w' at 0x?> re = <proxied module 'sys'>