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

Re: Merge tracking and cherry picking only some files in a change set

From: Justin Johnson <justinjohnson_at_gmail.com>
Date: 2007-03-09 16:35:38 CET

On 3/8/07, Daniel Rall <dlr@collab.net> wrote:
> On Thu, 08 Mar 2007, Justin Johnson wrote:
>
> > On 3/7/07, Daniel Rall <dlr@collab.net> wrote:
> > >On Wed, 07 Mar 2007, Justin Johnson wrote:
> > >
> > >> I brought this up in a different thread but wasn't getting a response,
> > >> and it seemed more appropriate to start a new thread specific to my
> > >> question.
> > >>
> > >> First, my understanding is that cherry picking refers to merging a
> > >> single complete change set (i.e. revision) instead of the entire list
> > >> of revisions that need to be merged. Correct me if I am wrong.
> > >
> > >The current plan is support merging of only portions of a change set.
> > >I've updated the Cherry Picking use case to better reflect this:
> > >
> > > http://subversion.tigris.org/merge-tracking/requirements.html#cherry-picking
> >
> > Great. That is more clear now.
>
> To be painfully explicit about this, it's supported at a file
> granularity, not at a patch hunk granularity within a file. I think
> this still meets your use case, but I wanted to make sure this is
> clear.

Yes, that is what I was looking for. Thank you.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 9 16:36:12 2007

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