On Mon, Aug 18, 2008 at 11:51 PM, Rohan Joseph <rohanjoseph_at_gmail.com> wrote:
> Thanks! My understanding of using --reintegrate is that it is used so
> as to avoid merging in changes on a branch, that came from the trunk,
> back to the trunk.
>
> Let's say that a user branches off the trunk, does some development and then
>
> 1. Syncs up with the trunk by merging from the trunk to the branch.
> Makes sure everything works and commits* the change to his branch.
>
> Now while syncing back to the trunk, he should use the --reintegrate
> switch. But if he instead, checked out the trunk, and blocked the last
> commit on the branch out by doing this
>
> svn merge -r N-1:N --record-only URL-TO-BRANCH
>
> where N is the revision number in which he committed the changes from
> step (1) [corresponds to * in step 1].
>
> Then instead of using the --reintegrate switch, he or she simply runs
> the merge command. Wouldn't it do the right thing and avoid a cyclical
> merge scenario? Or am I missing something here?
That would only work if completely ignoring the revision is the right
thing to do. For example, that commit may have also included conflict
resolution and you would be losing all of that work if you used that
approach.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-08-19 16:32:47 CEST