Mercurial > public > mercurial-scm > hg
diff tests/test-convert-svn-sink.out @ 5811:180a3eee4b75
Fix copies reporting in log and convert.
If copy logged in file revision, we report copy for changeset only
if file revisions linkrev points back to the changeset in question
or both changeset parents contain different file revisions.
This fixes extra copies reported when executable bit was changed for
previously copied file.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Sat, 29 Dec 2007 17:11:48 +0300 |
| parents | b63ef7b1441c |
| children | 5af5f0f9d724 |
line wrap: on
line diff
--- a/tests/test-convert-svn-sink.out Sat Dec 29 16:57:43 2007 +0300 +++ b/tests/test-convert-svn-sink.out Sat Dec 29 17:11:48 2007 +0300 @@ -167,31 +167,29 @@ d1 % executable 5:f205b3636d77 -svn: Path 'b' does not exist assuming destination a-hg initializing svn wc 'a-hg-wc' scanning source... sorting... converting... 0 make a file executable -abort: svn exited with status 1 -At revision 5. - 5 5 test . - M 5 4 test c - 5 1 test d1 - 5 1 test d1/d2 - 5 1 test d1/d2/b +At revision 6. + 6 6 test . + 6 6 test c + 6 1 test d1 + 6 1 test d1/d2 + 6 1 test d1/d2/b <?xml version="1.0"?> <log> <logentry - revision="5"> + revision="6"> <author>test</author> <date/> <paths> <path - action="D">/b</path> + action="M">/c</path> </paths> -<msg>remove a file</msg> +<msg>make a file executable</msg> </logentry> </log> executable