[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: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-11-29 16:06:14 CET

On Nov 29, 2007 8:27 AM, Kamesh Jayachandran <kamesh@collab.net> wrote:
>
> >> - '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.

Ah, right, so Ph.Marek's suggestion won't work for cherry-picking. So
you'll have to investigate one of the other two methods: either
subtract r51 from r60 and merge the resulting patch back to trunk, or
force r60 to be split into r60 and r61 when the user does the
cherrypicking.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Nov 29 16:06:29 2007

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