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

Re: To reintegrate or not to be ...

From: Branko Čibej <brane_at_xbc.nu>
Date: Tue, 18 Nov 2008 19:26:31 +0100

Ben Collins-Sussman wrote:
> Hm, I'd argue that the most common sort of merge is "please catch up
> my branch with its ancestor branch": just a plain old 'svn merge
> trunkURL'.

Ah. I was under the impression that you needed --reintegrate both ways.
Which then begs the quesiton, "why is it so hard to detect that you're
merging back to the parent branch" -- it shouldn't be ...

> On Tue, Nov 18, 2008 at 12:07 PM, Branko Čibej <brane_at_xbc.nu> wrote:
>> Hey.
>> A question suddenly popped into my mind.
>> So we have "svn merge --reintegrate" for doing repeated merges between
>> two active branches. Now I wondered, since this is probably the most
>> common merge usage in a centralized version control model, wouldn't it
>> be nice if one didn't have to type an unwholesomely long option to
>> enable it?
>> I'm sure I missed lots of little details here.
>> -- Brane

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-18 19:26:48 CET

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

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