Mercurial > hgsubversion
diff tests/fixtures/renames.sh @ 69:63ece4ea25c9
hg_delta_editor: register copies only if files are unchanged between source and dest
Handle copies of items from revision X into revision Y where X is not the
parent of Y. This cannot happen in Mercurial because copies always happen
between parents and children. A file copy is recorded if:
1- Source and destination revs are in the same branch.
2- The file is unchanged (content, type, removal) through all revisions between
destination and source, not including source and destination.
Directory copies are registered only if the previous rules apply on all copied
items.
[1] is there because file copies across branches are meaningless in Mercurial
world. We could have tried to remap the source rev to a similar one in the
correct branch, but anyway the intent is wrong.
[2] is more questionable but I think it's better this way for we live in a
non-perfect svn world. In theory, 99% of copies out there should come from the
direct parent. But the direct parent is a fuzzy notion when you can have a
working directory composed of different directory at different revisions. So we
assume that stuff copied from past revisions exactly matching the content of
the direct parent revision is really copied from the parent revision. The
alternative would be to discard the copy, which would always happen unless
people kept updating the working directory after every commit (see
tests).
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Wed, 05 Nov 2008 13:37:08 +0100 |
| parents | e0c86ebe05e3 |
| children | bf1e8b8ed452 |
line wrap: on
line diff
--- a/tests/fixtures/renames.sh +++ b/tests/fixtures/renames.sh @@ -18,18 +18,32 @@ svn import project-orig $svnurl -m "init svn co $svnurl project cd project/trunk +# Entries for regular tests echo a > a echo b > b mkdir -p da/db echo c > da/daf echo d > da/db/dbf +# Entries to test delete + copy echo deleted > deletedfile mkdir deleteddir echo deleteddir > deleteddir/f -svn add a b da deletedfile deleteddir +# Entries to test copy before change +echo changed > changed +mkdir changeddir +echo changed2 > changeddir/f +# Entries unchanged in the rest of history +echo unchanged > unchanged +mkdir unchangeddir +echo unchanged2 > unchangeddir/f +svn add a b da deletedfile deleteddir changed changeddir unchanged unchangeddir svn ci -m "add a and b" +# Remove files to be copied later svn rm deletedfile svn rm deleteddir +# Update files to be copied before this change +echo changed >> changed +echo changed2 >> changeddir/f svn ci -m "delete files and dirs" cd ../branches svn cp ../trunk branch1 @@ -63,6 +77,16 @@ svn ci -m "copy b from branch1" svn cp $svnurl/trunk/deletedfile@2 deletedfile svn cp $svnurl/trunk/deleteddir@2 deleteddir svn ci -m "copy stuff from the past" +# Copy data from the past before it was changed +svn cp $svnurl/trunk/changed@2 changed2 +svn cp $svnurl/trunk/changeddir@2 changeddir2 +svn ci -m "copy stuff from the past before change" +# Copy unchanged stuff from the past. Since no changed occured in these files +# between the source and parent revision, we record them as copy from parent +# instead of source rev. +svn cp $svnurl/trunk/unchanged@2 unchanged2 +svn cp $svnurl/trunk/unchangeddir@2 unchangeddir2 +svn ci -m "copy unchanged stuff from the past" cd ../.. svnadmin dump testrepo > ../renames.svndump