[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: Michael Hordijk <hoffbrinkle_at_hotmail.com>
Date: 2005-01-13 16:58:50 CET

> 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 use this when dealing with vendor drops. I tag my vendor drops like so:

vendor/
   tool/
      6.0/
      6.1/
      6.2/
      current/

If I last copied 6.1 over to my project directory, and I want to upgrade,
it's easy to use the URLs to do this:

merge vendor/tool/6.1 vendor/tool/current

OR

merge vendor/tool/6.1 vendor/tool/6.2

Now I get all the changes that happened between 6.1 and 6.2 (which is the
same as current) without having to go looking up revision numbers in the
logs...

- hoffer

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jan 13 17:07:29 2005

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