merging a partial branch

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
"real" merge later, it should be fine, as the files will all be the
same.

Does anyone see any problems with this?

thanks!

Rachel

      
Received on 2008-11-17 17:52:14 CET