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

Re: Issue 2897 revisited. Really.

From: Folker Schamel <schamel23_at_spinor.com>
Date: 2007-11-30 13:39:22 CET

Kamesh Jayachandran wrote:
> Hi Folker,
>
>>> My thoughts on solving this further may be on issue-2897 branch or
>>> part of some new issue branch.
>>> - Introduce the new boolean member 'is_reflective' to
>>> 'svn_merge_range_t'.
>>> - While populating 'remaining_ranges' populate this field when we
>>> encounter a reflective revision
>>> - non_reflective_merge_editor which would analyze the given revision
>>> number and do relevant non-reflective portions(adhoc local mods/merge
>>> from some other source part of this commit)
>>> - 'merge -r50:95 from /feature branch'
>>> - Oh r96 is a reflective, Use non_reflective_merge_editor to merge
>>> the non-reflective changes.
>>> - 'merge -r96:150 from /feature branch'
>>
>> This is a very special case of effectively doing a subtract during merge,
>> but it won't solve the general case (e.g. when having multiple branches
>> you are also merging in-between).
>>
>
> Sorry I am not meaning a subtraction here.
> Rather filter the non-merge changes from total revision changes(which
> includes merge from source 1, merge from source2, adhoc local mods) and
> apply.
>
> i.e my non_reflective_merge_editor(merge_source1) would apply changes
> from merge source 2 and local mods.
>
> With regards
> Kamesh Jayachandran

I see - sorry for my misunderstanding.

Cheers, Folker

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 30 14:01:39 2007

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