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

Re: Misleading TSVN Merge Dialog

From: Nathan Kidd <nathan-svn_at_spicycrypto.ca>
Date: 2006-02-23 23:44:03 CET

Simon Large wrote:
> Nathan Kidd wrote:
>> I think it would be a very useful improvement if instead of disabling
>> non-continuous revision selections the Merge dialog would
>> intelligently run the internal svn merge as many times as necessary to
>> achieve the correct results. (Yes, I realize this would be a lot of
>> work to change, including UI which would probably need to move to the
>> -c terminology instead of -r.)
> This has been requested before, but it is not as easy as it sounds.

I certainly didn't mean to suggest its easy! I only see this is as a
starting point for discussing possible ways of making it easier to
cherry pick many revisions for merging.

> Subversion does not support multiple merge ranges in that way, so TSVN
> would have to perform a merge for each revision range you specify. If
> one of those merges results in a conflict, the only thing it can do is
> stop with only some of the merges completed. And as SVN doesn't have
> merge tracking, it's up to you then to sort out the conflict and
> remember which of the revisions you still need to merge.

Absolutely. I think such a feature would have to be implemented in a
way analogous to the user performing a series of actions, and not try to
hide it as one merge under the hood. E.g. User specifies list of
revision ranges, then hits "Merge Next" for each range in the list,
viewing results after each action.

Maybe there's a simpler way, like a "Keep merge dialog open" checkbox
(or simply make it not go away after you hit Merge, and you have to hit
Close). I'm just groping for ideas of how to make merging multiple
items easier. I think for any reasonably sized project that's using
proper branching techniques merging like this would be very common.


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Feb 23 23:43:51 2006

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

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