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

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

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2005-01-13 18:57:47 CET

Rainer Müller wrote:
> I don't like introducing the term 'reverse merge' because it is a
> merge like any other.
> "Merge the range starting with 324 and ending with 323 into WC" sounds
> okay to me.

Fair point, and the SVN doc doesn't refer to reverse merges either.

Michael Hordijk wrote:
>> SVN also provides an alternate form:
>> svn merge URL1@rev URL2@rev [WCPATH]
> I use this when dealing with vendor drops.
> merge vendor/tool/6.1 vendor/tool/6.2

OK. Now I understand. I also found a section in the online docs, which
hasn't made it into the distributed manual yet.

Here is another attempt at a UI look which looks remarkably similar to
what we have already - much less work to change.

* The sources appear before the destination.
* The From/To wording has changed to what I hope is clearer.
* The Show log button is moved next to the revision box,
  which is what it relates to.
* The sense of the 'Use separate URLs' checkbox is reversed,
  it has a warning, and it is below the End revision.
* The destination wording is slightly different (again).

Is that any better?

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

Merge3.png
Received on Thu Jan 13 19:12:02 2005

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