[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 08:28:27 CET

On 1/3/06, Lakshman Srilakshmanan
<lakshman.srilakshmanan@tradingpost.com.au> wrote:
> Hi All,
> Happy New Year to you all.
> Could you please review the following and provide me with you valuable
> response.
> I have
> ------
> /repository/project1
> /trunk
> /branch
> To merge all the change in trunk@HEAD into branch@HEAD can I do the
> following.
> svn co svn://<host>/project1/branch my-branch-copy
> cd my-branch-copy
> svn merge svn://<host>/project1/trunk
> svn commit

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
svn merge svn://<host>/project1/trunk_at_rev1 svn://<host>/project1/trunk_at_rev2

> If the above is correct then the following will merge all changes on the
> branch into trunk ??
> svn co svn://<host>/project1/trunk my-trunk-copy
> cd my-trunk-copy
> svn merge svn://<host>/project1/branch
> svn commit

See the first comment

> Finally is it possible for me to make a copy of the branch
> ie svn copy svn://<host>/project1/branch
> svn://<host>/project1/branch_2
> Will branch_2 have cheap copies and become actual files (from trunk)
> when modified.

Yes, branch_2 will be a cheap copy of branch. (I did not understand
the latter part of your question)


-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 08:30:36 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.