[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-19 17:35:25 CET

At 17:24 19/01/2005 +0100, you wrote:

>Oops! That one has been present since the first 1.1.0 release. Why hasn't
>this bug been discovered much earlier?

I think many of us are so confused by merging that when it does something
unexpected, we assume it's us.

I just tried a 'dry run' of a merge into 1.1.3 (which I had neglected to
update first), and it gave me some conflicts. 'Fine' I thought - must
remember to update first.

Until I discovered that the conflicts had *actually* occurred in the WC -
so the run wasn't as dry as I'd hoped...

I think we need a big push merging after the 1.1.3 release:

1. Sort out the confusing interface
2. Make it clear from the progress dialog if you're 'dry running' or not
(and give the checkbox a more useful name than 'dry run', which requires an
immediate visit to the docs to work out what it means.
3. Make double-clicking on dry-run progress dlg items do something
sensible. (If it can't do a proper diff, we could at least avoid
displaying mysterious error messages.)

I'm sure some proportion of the problems I have with merges are down to my
own finger trouble, but I'm also sure that some aren't.

It's certainly not up to the high standard of the rest of the TSVN


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jan 19 17:36:26 2005

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