I recently upgraded a subversion server from 1.4.x to 1.6.6 as the old server
died an unrecoverable death the 1.6.6 server was loaded via backups from dump
files.
Now I am getting ready to re-integrate some branches back to their trunk, and
decided to try out the svn merge tracking functionality; while I have access to
a 1.6.12 client) my primary working copies are on a system that only has access
to a 1.5.1 client. So the basic setup:
subversion server: 1.6.6
subversion client: 1.5.1
However, when I went to follow the svn redbook's re-integration steps[1], I got
a series of entries that had their svn:mergeinfo property deleted. Being new to
this functionality, I tried googling it - but didn't find anything that seemed
to result in a "yes this is okay and harmless" or "there's a problem"; the best
I found was what seems like an unfinished thread[2]. Unlike that thread, since I
essentially did the dump/load upgrade path the server repository data should be
fully upgraded; also, this is the first merge on these branches since the
upgrade.
Now if it's the case that I shouldn't be trying to use the re-integration for
this branch, okay - I can do it the old way to close out the branch and then
start using this new functionality on new branches; but if I can, I'd like to
take advantage of this feature.
Finally, all branches were made from the same 'folder level' - i.e. I explicitly
branch/merge at an individual project's level - e.g. /project/trunk ->
/project/branches/<branch> - even when working with projects that are
svn:external's to another project, even if I do normal work inside the
svn:external - all branching/merging is done on its own working copy from the
project's namespaces.
So - (i) I am correct to use this feature on this branch _now_? Or do I need to
close out the branch first and then use it on future branches?
And (ii) is the fact that its deleting svn:mergeinfo data okay? Or is there
something else I need to do?
TIA,
Ben
[1]
http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.reintegrate
[2] http://svn.haxx.se/users/archive-2010-03/0572.shtml
Received on 2010-09-10 15:39:42 CEST