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

Re: [TSVN] Merging from deleted branch to trunk

From: Will Dean <svn_at_indcomp.co.uk>
Date: 2005-01-20 09:57:49 CET

At 16:14 19/01/2005 -0500, you wrote:
>What do you think is so wrong with it? I find it fairly useful. It is a
>decent way to "validate" that you entered the URL/Rev combos you wanted in
>that the output usually provides some clue as to whether you did it right.
> Now that I do merges on a very regular basis I do not use it as often as
>I am confident I am entering the right values. But before that, I used it
>regularly and still do on occasion.

Well, it only shows you if a file would be touched by the merge, not how
many times.

For example, I find an easy mistake to make is to forget to do the
'subtract one' from the 'from' revision. Very often the dry run gives you
no clue that you've made this mistake, because the file is modified again
in another revision, so still shows-up in the dry-run output.

>Any problems in it certainly are not the fault of TSVN.

That's true up to a point, but TSVN is more than merely a wrapper on the
SVN command line, and has certainly taken it upon itself to improve on SVN
in other areas. That said, I don't think that TSVN can do much about the
dry-run output!

>On the other point, I agree with Stefan on keeping the "dry-run" term. I
>have two main reasons:
>
>1) Unless there is a very compelling reason we should stay close to the
>Subversion terminology so that people can get maximum use of Subversion
>books and documentation. There is no reason to invent our own terms.

Funny enough, the Subversion book describes 'dry run' in a section which
has the title "

Previewing Merges". I feel this rather neatly makes my point that 'dry
run' is not an intuitive term, but is instead one which needs to be
explained with the use of the word 'preview'. However, I actually agree
with all of you that we shouldn't lose the phrase 'dry run' altogether.

>2) I personally think "dry-run" makes sense as the term.

I don't think it's illogical at all, I just think that it's not the best
choice of term. The Subversion book implicitly concedes this, I feel,
repeatedly using the word 'preview' in its explanation.

Will

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jan 20 09:58:28 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.