RE: RE: RE: Re: Merge question

Hi Andrew,

Just to clarify, if the last revision of trunk was 123 then, would the
following two commands be considered identical.

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

Thanks
Lakshman
-----Original Message-----
From: Reedick, Andrew [mailto:jr9445_at_ATT.COM]
Sent: Thursday, 17 January 2008 3:56 AM
To: Giulio Troccoli; users_at_subversion.tigris.org
Subject: RE: RE: Re: Merge question

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

================================================================================================
EMAIL DISCLAIMER

This email and any attachments are confidential. They may also be subject to copyright.

If you are not an intended recipient of this email please immediately contact us by replying
to this email and then delete this email.

You must not read, use, copy, retain, forward or disclose this email or any attachment.

We do not accept any liability arising from or in connection with unauthorised use or disclosure
of the information contained in this email or any attachment.

We make reasonable efforts to protect against computer viruses but we do not accept liability
for any liability, loss or damage caused by any computer virus contained in this email.
================================================================================================

---------------------------------------------------------------------
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-17 01:57:17 CET