[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: TSVN Merge issue vs. "Feature Branches" in SVN book

From: Will Dean <svn_at_indcomp.co.uk>
Date: 2005-01-13 14:41:26 CET

At 11:49 13/01/2005 +0000, you wrote:

>I'm having a look at this at the moment. AFAICT the common use case is
>to have the start and end points on the same URL in order to merge a
>range of revisions from a branch into the trunk (or from trunk to
>branch).

Yes, and that's presumably why the 'Use From URL' box is defuaulted to
being checked.

>SVN also provides an alternate form:
> svn merge URL1@rev URL2@rev [WCPATH]
>But I am struggling to see what this form is used for, so I am not sure
>how best to modify the UI so that this form is adequately supported.

I have so little understanding of merging that I can't offer any
suggestions here.

>What do you suggest? I only came up with a minor change:
>
>'All changes will be merged into the current working copy which is based
>at:\nURL'

Well, I think that would be an improvement, but it is the words 'from' and
'to' which I think are the most confusing bit.

You could also try "All changes will be merged into the current working
copy (URL)" although it's no more clear, and might be less so.

Cheers,

Will

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jan 13 14:42:43 2005

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