[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Subversion 1.5 about reintegrate and renames

From: Mark Phippard <markphip_at_gmail.com>
Date: Thu, 3 Jul 2008 09:03:43 -0400

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:


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.

Mark Phippard
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-03 15:04:59 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.