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.
A "svn merge -r 12:15 .." would be wrong here!
And a "svn merge -r 11:15 .." though correct, would seem weird to me.
>
> 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 ;-)
Udo
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jul 26 08:53:09 2005