RE: Merge from trunk head

Hi,

Thanks for your reply.

To confirm your suggestion I have listed the steps below with examples.
Could you please review it and provide me your feedback.

I have also included 2 new questions. I would greatly appreciate any
help.

To merge all the change in branch@HEAD into trunk@HEAD can I do the
following.
That is, will any changes committed in trunk be retained and changes
from the branch applied.
At the end of this process trunk will have the latest copy.

svn co svn://<host>/project1/trunk my-trunk-copy
cd my-trunk-copy
svn merge svn://<host>/project1/branch svn://<host>/project1/trunk
svn commit

Question 1.
Can I use the following as an alternative to the above.
Would my-copy (below) be as of trunk@head incorporating the changes from
branch@head.
At the end of this process trunk will have the latest copy.

svn merge svn://<host>/project1/branch svn://<host>/project1/trunk
my-copy
cd my-copy
svn commit

Question 2.
What is the merge syntax to merge a single file from branch@head to
trunk@head.
Would it be :

svn merge svn://<host>/project1/branch/file.txt_at_HEAD
          svn://<host>/project1/trunk/file.txt_at_HEAD my-copy/file.txt

Question 3.

If I make a copy of the trunk and create branch_1, all files at that
point will be cheap copies on branch_1. Lets assume this as rev 300

Now, if a file is edited and saved on the trunk (rev 301) will this be
reflected on the cheap copy on branch_1??

Finally - To clarify my earlier question.
> Will branch_2 have cheap copies and become actual files (from trunk)
> when modified.
Reading the svn manual I understood, that when a cheap copy is edited,
svn will provide a full copy of the file "as it existed" at the time of
creating the cheap copy. In branch_2 (at the time of creation) some
cheap copy should be referencing the trunk and others would be cheap
copy referencing branch_1.

Thanks
Lakshman

-----Original Message-----
From: Hari Kodungallur [mailto:hkodungallur@gmail.com]
Sent: Wednesday, 4 January 2006 6:28 PM
To: Lakshman Srilakshmanan
Cc: users@subversion.tigris.org
Subject: Re: Merge from trunk head

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

regards

--
-Hari Kodungallur
SpikeSource Inc.
http://developer.spikesource.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org