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

RE: RE: Re: Merge question

From: Reedick, Andrew <jr9445_at_ATT.COM>
Date: Wed, 16 Jan 2008 10:55:50 -0600

> -----Original Message-----
> From: Giulio Troccoli [mailto:Giulio.Troccoli_at_uk.linedata.com]
> Sent: Wednesday, January 16, 2008 10:50 AM
> To: users_at_subversion.tigris.org
> Subject: RE: Re: Merge question
> This is not clear at all.
> Recently I had to merge some code from a branch, back into trunk, that
> had been deleted years ago. I had, of course, have to use the peg
> revisions use case. In my case then that branch did not exist in HEAD,
> so it's "current state" is deleted. That is what I don't understand of
> your explanation.

The peg revision affects the repository. It determines what directories
are visible in the repository.

The -r X:Y refers to the revisions on the visible dir. It acts on
visible directories. It doesn't choose which dirs are visible.

Step 1: gather visible dirs. (peg rev)
Step 2: list the revision range of a dir (-r x:y)

Normal merge: svn merge -r 100:123 svn://server/repos/trunk_at_HEAD
Peg merge: svn merge -r 100:123 svn://server/repos/trunk_at_123

The two will give you very different results if trunk was deleted and
replaced with a different trunk in rev 125.
        svn rm trunk (commit as rev 124)
        svn copy beta.1.5 trunk (commit as rev 125)

To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-01-16 17:56:37 CET

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.