Mercurial > hg
diff tests/test-issue1175 @ 6875:0d714a48ab53
add a fix for issue 1175
If we copy a file followed by an update, it's possible for the parent
manifest to no longer contain the source file of the copy, which could cause
commit to fail. If this happens, we search backwares from the first
parent to find the most likely original revision.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 10 Aug 2008 18:01:03 -0500 |
| parents | |
| children |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-issue1175 Sun Aug 10 18:01:03 2008 -0500 @@ -0,0 +1,20 @@ +#!/bin/sh +rm -rf a +hg init a +cd a +touch a +hg ci -Am0 +hg mv a a1 +hg ci -m1 +hg co 0 +hg mv a a2 +hg up +hg ci -m2 + +touch a +hg ci -Am3 +hg mv a b +hg ci -Am4 a +hg ci --debug --traceback -Am5 b +hg verify +hg export --git tip