Dave Peterson wrote:
> I like this better than the previous images, and the current dialog
> as well. However, I think it might be clearer if it was something
> like this - sorry I can't generate images like you've done.
I just drew it in Delphi :-)
>
>
>> ---- Content of Merge -------------------------------|
>> |
>> Calculate Diff Between Tree 1: |
>> URL: --------------------------------------V |
>> o Head Revision |
>> o Revision ______ [Show Log] |
>> |
>> And Tree 2: |
>> URL: --------------------------------------V |
>> o Head Revision |
>> o Revision ______ [Show Log] |
>> |
>> X Allow different URLs |
>> |
> -------------------------------------------------------
>
>> ---- Merge Changes Into Path-------------------------|
>> |
>> Path: -------------------------------------V |
>> |
>> -----------------------------------------------------|
>
> X Dry Run
>
Part of the problem is that your use case (with 2 separate URLs) really
needs a different terminology from the single URL case.
In 2 URL mode you are indeed comparing 2 trees and merging the
differences into the WC, so your terminology makes sense.
In 1 URL mode you are just merging a range of revisions from 1 tree, so
the start/end terminology makes more sense. OK, you are still diffing 2
trees, but the concept of transferring a few revisions is easier to
grasp in this simpler case.
The only easy way round that as far as I can see is to change the
terminology when you click the 'Use 2 URLs' checkbox. And beef up the
doc!
Simon
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jan 14 11:13:13 2005