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

Re: Re: [PATCH] merge-tracking first merge being revert does not record 'svn:mergeinfo'

From: Madan U Sreenivasan <madan_at_collab.net>
Date: 2006-07-10 11:05:28 CEST

On Mon, 10 Jul 2006 12:37:56 +0530, Daniel Rall <dlr@collab.net> wrote:

> On Sun, 09 Jul 2006, Kamesh Jayachandran wrote:
> ...
>> If the first merge is revert, 'svn:mergeinfo' is not getting recorded.
[snip]
> This would record a reversed rangelist (e.g. "/trunk: 10-9, 7-5").
>
> If a range list (e.g. "10-9, 7-5") for a merge source (e.g. "/trunk")
> is not recorded in a WC's merge info, it's implied that either there
> have been no merges from that source, or that merges haven't been
> recorded. Either way, I'm not really seeing why we should record the
> "reverted" range, as they either weren't already merged (likely a
> no-op?), or there's no history of them being merged (meaning we've no
> merge history to adjust).

Exactly... I think so too... this is just an 'apply of a selected diff'
not a merge in its true sense.

OTOH, I think every branching operation ('svn cp') should record the merge
info of the source branch and its current revision (we already copy over
the indirect merge information during 'svn cp'). If we do that, we can
truly eliminate the need for recording reverse merges.

Regards,
Madan.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 10 10:35:23 2006

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