Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-excessive-merge @ 3881:c0a12e6441a5
Fix copy detection corner case
We were aborting if the copied from rev was before the cut-off limit,
rather than the copied _to_ rev. The copied from rev can be
arbitrarily old.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 12 Dec 2006 17:52:33 -0600 |
parents | c0b449154a90 |
children |
line wrap: on
line source
#!/bin/sh hg init echo foo > a echo foo > b hg add a b hg ci -m "test" -d "1000000 0" echo blah > a hg ci -m "branch a" -d "1000000 0" hg co 0 echo blah > b hg ci -m "branch b" -d "1000000 0" HGMERGE=true hg merge 1 hg ci -m "merge b/a -> blah" -d "1000000 0" hg co 1 HGMERGE=true hg merge 2 hg ci -m "merge a/b -> blah" -d "1000000 0" hg log hg debugindex .hg/store/00changelog.i echo echo 1 hg manifest --debug 1 echo 2 hg manifest --debug 2 echo 3 hg manifest --debug 3 echo 4 hg manifest --debug 4 echo hg debugindex .hg/store/data/a.i hg verify