Re: Subversion 1.5 about reintegrate and renames

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)

Thanks

Mark Phippard-3 wrote:
>
> On Thu, Jul 3, 2008 at 2:14 AM, rjk1408 <rohanjoseph_at_gmail.com> wrote:
>>
>> You have mentioned that until the feature is fixed, we can
>> use
>> the 2-URL syntax - but will this fix the problem of merging from branch
>> to
>> trunk AFTER a rename/move has taken place?
>>
>> E.g Will the following use case work if I try the merge using the 2-URL
>> command?
>>
>> Edit foo.c on branch1
>> On branch2, rename foo.c to bar.c
>> Case I: merge branch1 --> branch2
>> svn merge will skip the file, because it can't find it
>> Case II: merge branch2 --> branch1
>> svn merge will delete the 'newer' version of foo.c and add bar.c, which
>> has
>> the older text
>
> No. Subversion 1.5 has not made any attempt to handle renames better
> than previous versions. All of the issues I blogged about here still
> exist in 1.5:
>
> http://markphip.blogspot.com/2006/12/subversion-moverename-feature.html
>
> There is some work going on in this area in the tree-conflicts branch.
> That might make it into 1.6 if it gets wrapped up soon.
>
> --
> 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-tp18135802p18260039.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