[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: Ryan Schmidt <subversion-2006Q1_at_ryandesign.com>
Date: 2006-01-05 11:47:43 CET

On Jan 5, 2006, at 04:44, Lakshman Srilakshmanan wrote:

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

Yes, that sounds much better! :-)

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 5 11:50:41 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.