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

Re: [TSVN] Re: Re: Merge dialog, second attempt

From: matthew ford <matthew.ford_at_forward.com.au>
Date: 2005-01-26 00:20:33 CET

----- Original Message -----
From: "Simon Large" <slarge@blazepoint.co.uk>
To: <dev@tortoisesvn.tigris.org>
Sent: Wednesday, January 26, 2005 9:54 AM
Subject: [TSVN] Re: Re: Merge dialog, second attempt

>
> But they _are_ closely related, which is why they have used the same way
> of describing relationships between trees.

Yes they are closely related but the SVN docs adivse against using diff for
merge operations and in fact say merge is different.

>
> Look at the feature branch merge. There you take the diff between
> trunk@rev and branch@rev. There is no -1 involved. So what are the
> conditions when you decide to apply a -1 automatically? Being
> unpredictabe is possibly worse than being non-intuitive.

Clearly here the trunk URL is different from the branch URL so the -1 does
not apply.

If you are really concerned about maitaining CLI compatablitiy then you can
display a CLI version of the dialog box in a status bar.
Actually I would like to see that included.
Nice to check that what is going to happen is what you think should happen.
I find when I have problems with TSVN (actually usually with my
understanding of SVN), I go back to the CLI to sort it out, so I would
appreciate a CLI status in the dialog boxes.

matthew

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jan 26 00:21:06 2005

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