[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: Tom Widmer <tom.widmer_at_googlemail.com>
Date: Mon, 30 Jun 2008 12:43:34 +0100

Mark Phippard wrote:
> On Fri, Jun 27, 2008 at 9:57 AM, Tom Widmer <tom.widmer_at_googlemail.com> wrote:
>> Baeriswyl Kuno - Extern (IT-BA-MV) wrote:
>>> Hello!
>>> I've installed the collabnet build for RC9 on my windows host. I
>>> followed the instructions in the Subversion Book, though, the first thing I
>>> tried failed. :
>>> Does anybody know a workaround or best practice for reintegrating branches
>>> back to the trunk? What's the roadmap to fix this problem?
>> Looks like a bug to me (someone else asked the same question a few hours
>> earlier). I'd suggest you try the developer mailing list.
> We were aware of this before we released. It kind of sits somewhere
> between a bug and just a scenario we need to improve. First off,
> there is nothing magical about svn merge --reintegrate. It is just a
> convenient syntax for how you had to do this kind of merge before 1.5.
> Namely:
> svn merge url://trunk@LAST-SYNC-REV url://branch@HEAD
> Where LAST-SYNC-REV is the last revision from trunk that has been
> synched to the branch. You can still use this syntax with 1.5 and it
> still works. Since --reintegrate is a syntax shortcut and does some
> of this calculation for you, we decided (rightly or wrongly) that it
> should do some checks for possible problem cases and not run the merge
> if it finds any issues. The checks are relatively simple right now
> and what we have to decide is how much it is worth investing in making
> them smarter. In this particular case, the check is just a false
> positive.

I guess this is a potential problem case due to Subversion treating
moves as copy+delete? So if changes have happened in trunk to the moved
file since the last merge with the branch, they would be lost in the merge?


To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-06-30 13:44:13 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.