Re: Subversion 1.5 about reintegrate and renames

I would also assume then, that using it will not necessarily break anything.
i.e if a user never synced up with the trunk, and did the following

cd trunk-working-copy
svn up
svn merge --reintegrate URL-TO-Branch .

It will produce the same effect as

cd trunk-working-copy
svn up
svn merge URL-TO-Branch .

I say this because, I tested out the two commands and found the
svn:mergeinfo to be the same in either case. This is not immediately
obvious, because when you run the first command, all it prints out is

--- Merging differences between repository URLs into '.':

Whereas, the second command actually prints out revision range :

--- Merging r5 through r20 into '.':

Examining the svn:mergeinfo in both cases shows

/branch/branch2:5-20

Hence, --reintegrate is as good as ignored in this case.

Mark Phippard-3 wrote:
>
> On Mon, Sep 29, 2008 at 6:48 PM, rjk1408 <rohanjoseph_at_gmail.com> wrote:
>>
>> It seems from the subversion book, that reintegrate should be used only
>> if
>> one intends to periodically sync up with the trunk. Is this true? What If
>> a
>> user never intends to merge from the trunk into his branch but only
>> wishes
>> to put his changes back to the trunk? Does he need to use reintegrate at
>> all?
>>
>> I tried this with a simple repository, and nothing broke, I kept making
>> changes on my branch and kept pushing them to the trunk with the regular
>> merge command i.e
>>
>> cd trunk-working-copy
>> svn up
>> svn merge URL-TO-BRANCH .
>>
>> If a branch never syncs up with the trunk, then does reintegrate need to
>> be
>> used at all?
>
> No, it doesn't need to be used unless you have done a merge from trunk
> to the branch. As long as you understand when you can and cannot use
> the technique you are using, you are fine to do what you have been
> doing.
>
> --
> 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
>
>
>

-- 
View this message in context: http://www.nabble.com/Subversion-1.5-about-reintegrate-and-renames-tp18135802p19743566.html
Sent from the Subversion Users mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org