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

Re: Why is --reintegrate neccessary?

From: Tino Schwarze <subversion.lists_at_tisc.de>
Date: Tue, 29 Jun 2010 10:56:09 +0200

Hi Olivier,

On Tue, Jun 29, 2010 at 10:18:31AM +0200, Olivier Sannier wrote:

>> I've had a discussion with a collegue yesterday and he wondered why
>> --reintegrate is neccessary for reintegration merges at all. He supposed
>> SVN should be able to determine that the intended merge is a reintegrate
>> by looking at the mergeinfo.
>> So, this is just a question out of curiousity: Why is it neccessary to
>> specify --reintegrate? Or: In which case would a potential
>> auto-detection fail?

> As always, the book is here for you:
> http://svnbook.red-bean.com/nightly/en/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.reintegrate

I read that, but failed to understand why the mergeinfo-Properties set
on the branch do not suffice to figure out what to reintegrate...

Given a very simple repo with three revisions like that:

/trunk/file (r2)
/branch/bla/file (r4, mergeinfo in r3: Merged /trunk/@1-2)

If I ran "svn merge /branch/bla" it's possible to detect that r3 is the
result of a merge, so only r4 needs reintegration into trunk.

Note that I'm not questioning the existence of the --reintegrate option,
I just want to understand the particular case which made it neccessary
in the first place.



"What we nourish flourishes." - "Was wir nähren erblüht."
Received on 2010-06-29 10:56:47 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.