[TSVN] Re: Re: TSVN Merge issue vs. "Feature Branches" in SVN boo k

I wrote:
> One of the problems we need to avoid is creating confusion over
> reversed merges. I want to back out revs 323 to 324, so I merge
> from:324 to:323. If you try to put that into old/new terminology you
> can get yourself in a twist.
>
> There might be a case for a Reverse Merge checkbox, so we require the
> user always to set (End >= Start), but reverse them internally in the
> case of an 'undo' merge.
>
> And I am still worrying away at a better way of fitting in the
> optional 'To:' URL...

OK, here are some pictures for you. Is it any better? Is it hard to
implement?

Merge1.png is the default case. Only 1 URL show as the source, and you
use the reverse merge checkbox to cope with the 'undo changes' case more
clearly. The range of revisions is always checked to make sure (End >=
Start).

If you click on 'Use different Start & End URLs', the dialog changes
slightly to Merge2.png. The End group box moves down a bit to make room
for the 2nd URL. It is no longer possible to work out reverse merges
from revision numbers, so that checkbox is hidden and you have to work
it out for yourself. Of course the check for (End >= Start) is
suppressed in this case.

The 'Use different ...' checkbox should maybe have a hint box warning
that it is for advanced users only (and Simon doesn't understand the
manual, so don't ask for any help).

Simon

-- 
       ___
  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