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.)
-Nathan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Feb 23 18:14:10 2006