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

Re: Merge from trunk head

From: Hari Kodungallur <hkodungallur_at_gmail.com>
Date: 2006-01-04 20:53:58 CET

On 1/4/06, Scott Palmer <scott.palmer@2connected.org> wrote:
> On 4-Jan-06, at 2:28 AM, Hari Kodungallur wrote:
> >
> > svn merge actually takes two URLs at different versions. Say URL1 and
> > URL2. It takes the difference between the versions and applies it to
> > your working copy. So, you merge command should be either
> > svn merge -r N:M svn://<host>/project1/trunk
> > or
> > svn merge svn://<host>/project1/trunk_at_rev1 svn://<host>/project1/
> > trunk@rev2
> Are you sure that the second example does the same as the first? I
> thought the "peg revisions" were used only to lookup a path that
> might have changed in other versions. That is if URL1 and URL2 are
> the same path then there is no difference. I think the help could be
> clearer on this. I assumed that URL1 and URL2 would be tags at
> different points or something similar.

I do a "svn diff" with URL@rev1 and URL@rev2 all the time. And it
gives me the correct diff even if the paths are same (but the files
have changed). I am assuming merge works the same way.


-Hari Kodungallur
SpikeSource Inc.
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 4 21:33:35 2006

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.