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

Simon Large <slarge <at> blazepoint.co.uk> writes:

> Is that any better?

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.

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

I may have missed a few controls in there but you get the idea I hope.

-----
Dave Peterson

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jan 13 20:19:18 2005