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

[TSVN] Re: Re: TSVN Merge issue vs. "Feature Branches" in SVN book

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2005-01-13 12:49:53 CET

Will Dean wrote:
> I tried a merge yesterday for the first time, and fell into the same
> to/from confusion that lots of other people have.
>
> Could we call the two group boxes 'start revision' and 'end revision'
> or similar? Would that be more appropriate?
>
> 'To'/'From' is too easily mistaken for 'source'/'destination', IMO,
> even if it's the terminology which TSVN uses.

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).

Ideally, I would prefer the existing "To:" URL not to be visible at all
by default, which makes it easier to show the range of revisions being
merged in.

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.

> The text at the top of
> the dialog 'Merge changes into the current working copy which points
> to the URL:' is also pretty clunky.

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'

Simon

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jan 13 12:49:27 2005

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