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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 30 13:25:00 2007