Mercurial > public > mercurial-scm > hg
diff tests/test-convert-hg-source.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 | 11e1e574da02 |
| children | 4b0c9c674707 |
line wrap: on
line diff
--- a/tests/test-convert-hg-source.out Sat Dec 29 16:57:43 2007 +0300 +++ b/tests/test-convert-hg-source.out Sat Dec 29 17:11:48 2007 +0300 @@ -9,11 +9,12 @@ scanning source... sorting... converting... -4 add foo bar -3 change foo -2 make bar and baz copies of foo -1 merge local copy -0 merge remote copy +5 add foo bar +4 change foo +3 make bar and baz copies of foo +2 merge local copy +1 merge remote copy +0 mark baz executable comparing with ../orig searching for changes no changes found