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

Re: problem merging to ACE_wrappers

From: Christopher Ness <chris_at_nesser.org>
Date: 2005-06-17 16:18:58 CEST

On Fri, 2005-06-17 at 14:53 +0200, Peter Hercek wrote:
> svn co svn://svn/trunk/lib/ACE_wrappers
> cd ACE_wrappers
> svn merge svn://svn/tags/lib/ACE_wrappers/ACE_5_3_1_and_TAO_1_3_1
> svn://svn/tags/lib/ACE_wrappers/ACE_5_4_5_and_TAO_1_4_5

Since you checked out the ACE_wrappers directory why not try to do a
working copy merge instead of on the server with the two URL's you used?

You need to give a 3rd argument which is the WC_PATH you want to apply
the merge changes to!

A merge example is given in the book in vendor branches, but it is
difficult to read in my firefox browser as the computer text appears
really large. There are 3 arguments to the merge command about 1/2 way
down the page.

         http://svnbook.red-bean.com/en/1.1/ch07s05.html

Cheers,
Chris

-- 
Wireless Group,
McMaster University
finger.localdomain
10:11:25 up 1 day, 18:35, 2 users, load average: 0.09, 0.14, 0.09
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 17 16:22:34 2005

This is an archived mail posted to the Subversion Users mailing list.