[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: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-11-29 15:27:18 CET

>> - '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'
>>
>
> Sure... the hard part here is: how are you going to divide r96? You
> need to 'subtract' /trunk:50-95 from r96, and capture the leftover
> diff. Or, as Ph. Marek has suggested, maybe you can generate the
> special diff by simply comparing trunk@95 with branch@96.

This may not work out in the following scenario,
- Create /fb from /trunk
- merge -r51from /trunk to /fb This results in a reflective commit r60
Now if merge /fb to /trunk working copy if we take the special diff
approach of applying (/trunk@59 ~ /fb@60) it can give rise to a false
result as /fb does not have all the changes from /trunk but only the r51.

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 Thu Nov 29 15:26:58 2007

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