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 02:33:54 2006