Today I upgraded my work machine from TortoiseSVN 1.7.x to 1.8.3, and
when doing a cherry-pick merge, I noticed that double click does no
longer work for selection a revision from the revision log.
My workflow for a cherry-pick merge, in case you are unable to reproduce:
1. right click on the branch root to merge to, select "Merge" (pulled
to the main menu)
2. Click Next
3. Click Show Log as the merge source URL (trunk) is already prefilled
4. Double-click the revision to merge
5. Double-click the Next button (to skip the last page which is
already set up as I want it)
6. Hope that no conflicts have to be resolved (usually the case)
7. Click "OK"
8. Commit the change.
And in step 4 I can no longer double click, but have to click OK
instead. As I sometimes spend quite a lot of time merging one (more or
less trivial) bug fix into several branches, that extra click (ok
technically it is the same amount of clicks, but one more mouse
movement) gets annoying quickly, so I'd appreciate getting my double
Cross-checking some other functions (Repo browser, Update to revision)
makes it appear to be at least consistent as double click does not work
any longer in any revision log window.
Any other suggestions to speed up the merging workflow would also be
appreciated, of course (for example if there is some well-hidden feature
to repeat the last merge on another branch or to merge the same revision
into multiple branches in one step, it would be awesome). I'm doing the
merges directly after having performed the commit on trunk, and all
branches to merge to are part of a single (sparse) checkout of
/branches, to make updating all of them every morning quicker, if that
matters for your suggestions.
I also tried using the command line for the merge, or copying in the
revision number manually, but I miss the visual feedback from the log
dialog, and in case a conflict has to be resolved (in most cases "Use
mine before theirs" or vice versa is sufficient in my cases (XML files))
invoking TortoiseMerge is really quick from TortoiseSVN, so these
workflows don't appear to be faster for me. And as not all cherry-pick
merges should target the same branches, it is not easy either to script
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-11-12 22:25:00 CET