Re: Subversion 1.5 about reintegrate and renames

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?

Thanks!

Mark Phippard-3 wrote:
>
> On Thu, Jul 3, 2008 at 10:04 AM, rjk1408 <rohanjoseph_at_gmail.com> wrote:
>>
>> I read through your blog-post. You mention refactoring and effective
>> communication between team mates to make sure such problems don't crop
>> in.
>> Could you please explain what then would be a best known method or best
>> practices for merging AFTER a rename has taken place? For example, lets
>> say
>> 10 files on a branch have been renamed and committed in a single commit
>> transaction. If a merge from the branch to the trunk has to happen now,
>> how
>> would one go about fixing this problem? (I assume neither --reintegrate
>> nor
>> the 2-URL syntax are the way to solve this now)
>
> The current issue with reintegrate is just that some "error checking"
> it does is blocking the merge from running. When it does run, it is
> just a 2-URL merge. So they are the same thing.
>
> There is no Subversion merge (or update, or switch) option that
> follows a rename and merges the contents into the renamed file for
> you. I do not really know what your options are when you have done
> that. Perhaps a file by file merge on the renamed files? Basically
> the equivalent of create a patch with the changes in it, and apply it
> to the other file name.
>
> --
> 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-tp18135802p19733224.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