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

Re: [TSVN] Re: TortoiseSVN 1.2.1.3895 - Merge "From" Revision Selection Bug

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-07-26 09:59:51 CEST

Udo Schifferdecker wrote:
> Simon Large wrote:
>
>> OK, continue this line of thought to the next time you want to merge:
>>
>> 15 Added file to branch
>> 14 More changes in branch
>> 13 Changed trunk
>> 12 Changed branch
>> 11 Merged r8-10 into trunk
>> 10 Modified branch
>>
>> Now you want to select the revisions to merge.
>> Show log for the branch and select the revisions to merge, r12-15.
>> Using your method we would have to select r10-15, and people would ask
>> 'why am I merging r10 again; I already did that last time'.
>
> Well. I find r10 the natural choice.
> Using the commandline, I would do a "svn merge -r 10:15 .." also.

Yes, but you are a seasoned commandline user. This is a GUI, intended
(in part) for people who *never* use commandline tools. If you want to
merge one revision, say r14, you would use svn merge -r r13:14. In TSVN
you just select the one revision you want to merge and let the TSVN work
out its predecessor for you.

> A "svn merge -r 12:15 .." would be wrong here!

It would, but if you select revs 12-15, TSVN fills in the boxes with
11-15, so we don't do the wrong thing.

> And a "svn merge -r 11:15 .." though correct, would seem weird to me.

... and the whole issue of subtracting 1, or at least selecting a
revision before the one you want to merge seems weird to others.

>> Whichever way you choose to implement it, someone will find it
>> confusing, and many people *did* find it confusing before.
>
> That is surely true. The Merge dialog/action is complicated.
> I just would like to select the same revs in the "Show Log:" I would use on
> the commandline.
> The current behaviour is just "too much magic" for my taste ;-)

If you have any suggestions about how to do this better, so as to keep
both GUI-lovers and commandline-lovers happy, please tell us.

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
Received on Tue Jul 26 10:03:23 2005

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