RE: Merge from trunk head

Hi,

Thanks for the link it DEFINITLY put merging in a new perspective.
It's funny, now when I re-read the svn manual, I view merging from a new
angle.
Thank you very much.

To re-cap what I was doing.

To merge all the change in branch@HEAD into trunk@HEAD I do the
following.
That is, any changes committed in trunk will 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 -r "rev since last merge" : "curr rev"
svn://<host>/project1/branch
svn commit -m "merged from branch fromRev:toRev"

PS. The comment becomes important, as it is the only source of
information for subsequent merges.
    (This is mentioned in the manual. Only now I understand the
importance).

Please confirm that I have finally grasped the concept of merging.

Thanks in advance
Lakshman

-----Original Message-----
From: Ryan Schmidt [mailto:subversion-2006Q1@ryandesign.com]
Sent: Thursday, 5 January 2006 12:31 PM
To: Lakshman Srilakshmanan
Cc: users@subversion.tigris.org; hkodungallur@gmail.com
Subject: Re: Merge from trunk head

On Jan 5, 2006, at 02:13, Lakshman Srilakshmanan wrote:

> 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

No. That's not how you use merging, and that doesn't do what you want
it to do.

Perhaps the explanation I just wrote in another thread will help you:

http://svn.haxx.se/users/archive-2006-01/0149.shtml

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 5 04:46:35 2006