Issue found: rename prior to merge --reintegrate
From: Baeriswyl Kuno - Extern (IT-BA-MV) <kuno.baeriswyl_at_sbb.ch>
Date: Mon, 30 Jun 2008 08:59:59 +0200
I've found an issue with renames and merge --reintegrate. After any rename operation in my repository, the merge --reintegrate operation complains about unmerged revisions. Even if, the rename was been made prior the branch initiation.
2. move trunk/test1.txt to trunk/test3.txt and commit
d:\temp\subversion-1.5-repo\checkout\test\trunk>svn move test1.txt test3.txt
d:\temp\subversion-1.5-repo\checkout\test\trunk>svn commit -m ""
Committed revision 2.
3. copy trunk to branches/a and commit
Committed revision 3.
4. cd branches/a
5. merge trunk and commit
d:\temp\subversion-1.5-repo\checkout\test\branches\a>svn commit -m ""
Committed revision 4.
6. Go trunk, update and reintegrate branch/a to trunk.
d:\temp\subversion-1.5-repo\checkout\test\trunk>svn merge --reintegrate svn://localhost/temp/subversion-1.5-repo/test/br
It seems that any rename lead to an inconsistent state of the repository. Given that renames are a quite commen operation on a repository, the merge --reintegration operation turns to be totally useless. I tried to debug the mergeinfo properties. I don't understand how it works in details, though, following output seems to be strange to me:
d:\temp\subversion-1.5-repo\checkout\test\branches\a>svn pg -R svn:mergeinfo
test3.txt was never part of branch a, since the branch has been made after the rename.
This is an archived mail posted to the Subversion Dev mailing list.