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

Re: Does a path ever need mergeinfo from itself?

From: Tom Widmer <tom.widmer_at_camcog.com>
Date: Tue, 15 Jan 2008 17:05:55 +0000

Paul Burba wrote:
>> -----Original Message-----
>> From: Kamesh Jayachandran
>> Sent: Tuesday, January 15, 2008 9:19 AM
>> To: Paul Burba; dev_at_subversion.tigris.org
>> Subject: RE: Does a path ever need mergeinfo from itself?
>>
>> It just comes from a prop merge, may be we can make
>> merge_props_changed of diff callbacks to ignore mergeinfo
>> from /target to itself.
>
> Thanks Kamesh,
>
> I was thinking the same thing. I just wanted to be sure that nobody was
> relying on this mergeinfo being explicitly present (i.e. the issue-2897
> branch or reintegrate branch had some bizzare need for it that was not
> obvious).
>
> Taking a look at getting rid of this (taking into account cmpilato's
> warning of course).

What if someone merged a range of revisions from the same path into that
path? For example, r1 adds some changes, r2 backs then out, r3 has
conflicting but unrelated changes, but then they decide to merge the r1
changes back in, resolve the conflicts and commit as r4. In that case,
should the path have the mergeinfo saying that r1 was merged (at r4)? It
might be relevent information if, for example, r1 and r4 are cherry
picked to a branch...

Has anyone has taken on board Folker Shamel's suggestion that the
mergeinfo property should only contain direct merge information? I think
it's important to get the mergeinfo property right before going any
further...

Tom

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-01-15 18:06:16 CET

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