merging a partial branch

[Rachel Brooks <ra...@yahoo.com>]

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


      

Fwd: merging a partial branch

[Purple Streak <mr...@googlemail.com>]

Forwarding to list

2008/11/16 Rachel Brooks <ra...@yahoo.com>:
> 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?

This is a limitation with SVN merging currently that it doesn't really
allow you to do a partial merge. When merging back you have to use
--reintegrate - however the issue now is that merging changes from
trunk to the branch become harder which is why the documentation
recommends you start a new branch at that point.

Take a look at http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=145519
which explains it better

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org