merging a partial branch
From: Rachel Brooks <rach2522_at_yahoo.com>
Date: Sun, 16 Nov 2008 09:51:50 -0800 (PST)
Hi there, I have to merge a part of a branch back into the trunk. I assume this would be done like this:
cd to the specific directory in a fresh working copy of the trunk (ie, the actual piece i want to merge, not the root)
svn merge trunkurl/same_specific_directory _as_above
Do I use the reintegrate flag in this case?
According to the docs: "In Subversion 1.5, once a --reintegrate merge is done from branch to trunk, the
branch is no longer usable for further work."
So Im thinking i should not use the reintegrate flag, and when I do the
Does anyone see any problems with this?
This is an archived mail posted to the Subversion Users mailing list.