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

RE: Re: Why is --reintegrate needed for svn 1.5 merging?

From: Giulio Troccoli <Giulio.Troccoli_at_uk.linedata.com>
Date: Fri, 30 May 2008 16:11:34 +0100

Linedata Services (UK) Ltd
Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB
Registered in England and Wales No 3027851 VAT Reg No 778499447
-----Original Message-----

> svn merge url://trunk@LAST-REV url://branch
> Where LAST-REV is the last revision from trunk that was merged to the
> branch.
> The --reintegrate option was added as a syntax shortcut to make this
> type of merge easier to use. The above merge becomes this:
> svn merge --reintegrate url://branch

I hope this does not mean that you must have trunk, but instead
Subversion will use the place where the branch was, well, branched off

For example, if I create the branch with

svn copy http://myserver/path/to/dir1 path/to/dir2

And then I use

svn merge --reintegrate http://myserver/path/to/dir2

Subversion will do the same as

svn merge http://myserver/path/to/dir1@LAST-REV
Am I right?


To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-05-30 17:12:13 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.