Mercurial > hg
diff tests/test-issue1175.out @ 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 | d557749c627a |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-issue1175.out Sun Aug 10 18:01:03 2008 -0500 @@ -0,0 +1,24 @@ +adding a +1 files updated, 0 files merged, 1 files removed, 0 files unresolved +warning: detected divergent renames of a to: + a2 + a1 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +adding a +b + b: searching for copy revision for a + b: copy a:b80de5d138758541c5f05265ad144ab9fa86d1db +checking changesets +checking manifests +crosschecking files in changesets and manifests +checking files +4 files, 6 changesets, 4 total revisions +# HG changeset patch +# User test +# Date 0 0 +# Node ID 755e75751bf67eb4378bca61987df035d90a7a06 +# Parent 7399822c2e395fe7d57c2fcf4b310f6fb22f8c2d +5 + +diff --git a/b b/b +new file mode 100644