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

Re: Implicit keep-alive after reintegrate merge

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Fri, 20 Jan 2012 12:40:06 +0200

Branko Čibej wrote on Fri, Jan 20, 2012 at 09:52:34 +0100:
> On 20.01.2012 03:23, Daniel Shahaf wrote:
> > To rule out the common case: are you familiar with Stefan's post giving
> > a reasons for this?
>
> Nope.
>
> > His argument is that 'cd trunk-wc && svn merge ^/branches/feature-branch'
> > and 'cd 1.7.x-wc && svn merge ^/trunk' are syntactically indistinguishable
> > but need to execute a semantically different algorithm each.
>
> Huh. Why? How are branches, once created, not partial mirrors of each
> other, with the missing bits noted in mergeinfo? Do you have a link to
> the post? I'm really intrigued about this assertion.

Sure, here it is:

12:37:24 @danielsh | wayita: reintegrate?
..
12:37:25 wayita | danielsh: If you want to know why --reintegrate is necessary, see http://mail-archives.apache.org/mod_mbox/subversion-dev/201107.mbox/%3C20110720124721.GA7557@ted.stsp.name%3E

Sorry for not including the link originally --- I was tired and couldn't
recall how to recompute it.
Received on 2012-01-20 11:41:00 CET

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