[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: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2006-02-23 22:46:23 CET

Nathan Kidd wrote:
> Ron Avriel wrote:
>> Subversion merge accepts only a single range of revisions to merge
>> into the working copy. However, the TSVN merge dialog *apparently*
>> enables selecting multiple ranges for merging from the “show log” dialog.
> ...
>> I think the “show log” dialog from merge should only allow selecting
>> a single consecutive revision range.
> When merging changes between branches I often wish for a different
> solution to this.
> The reason someone might select multiple, non-continuous revision
> numbers is because they want to cherry-pick changes but don't want to
> keep looping over:
> :start
> - right-click, select TortoiseSVN -> Merge
> - ensure from path correct
> - click show log, scroll to and select revisions, OK
> - Click Merge, eyeball results list to verify no conflicts
> goto start
> If you have many revisions to merge this gets extremely tedious.
> 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.
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.

I suppose TSVN could grow a dialog which lists the revision ranges and
ticks them off as each merge is completed, allowing you to sort out any
conflicts as you go. But that sounds like a lot of work to me, and it
probably sounds like a *huge* amount to Stefan ;-)


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Feb 23 22:45:37 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.