[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 16:16:46 CET

Mark Phippard wrote:
> On Nov 29, 2007 10:10 AM, Kamesh Jayachandran <kamesh@collab.net> wrote:
>>> 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.
>> Forcing the commit to fail if it has some local mod along with merge
>> could be easy I think, though I would prefer having something like
>> non-reflective merge editor, which I am investigating.
> I do not think anyone is suggesting you could not do the commit. Just
> that commit would somehow "magically" perform two commits instead of
> one. I honestly do not see how that is possible, but that is the
> suggestion.

Thanks for clarifying that, then I am not sure the ease of
implementation of that.

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 16:16:27 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.