[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Howto: Merge Branch Into Trunk

From: Ryan Schmidt <subversion-2008b_at_ryandesign.com>
Date: Wed, 25 Jun 2008 06:29:38 -0500

On Jun 25, 2008, at 06:21, Ali Yakout wrote:

> I'm using Smartsvn as my subversion client, I'm trying to merge my
> branch to the trunk (I use Modify->Modify from URL), the merge
> succeeds but the changes are not actually "merged" into the trunk,
> instead it is "replaced" by the branch.

Then you gave the wrong arguments to the merge command.

> I tried also the command line merge as in <http://www.sepcot.com/
> blog/2007/04/SVN-Merge-Branch-Trunk> tutorial but I got the same
> results.
> How can I do real merges?

Show us the actual command you used.

Also, note that Subversion 1.5, now released, has much-improved merge
support, with improved syntax as well. Let us know if you're using
Subversion 1.5 or a different version so we can be sure to guide you
to the right instructions.

To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-06-25 13:30:05 CEST

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.