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

Re: Problems with merging...

From: Marc Haisenko <haisenko_at_comdasys.com>
Date: 2006-03-20 13:48:50 CET

On Monday 20 March 2006 13:38, Pev wrote:
> so, I know the revisions are correct. If I then try :
> svn merge -r 14:108 svn://svnserver/projects/test1/trunk/notes.txt

You need to do it the other way round: -r 75:14, because you want to merge the
reverse of the change between 14 (good) and 75 (messed up). I normally just
look for the messed revision and then do -r 75:74 which works as well.

C'ya,
        Marc 

-- 
Marc Haisenko
Comdasys AG
Rüdesheimer Straße 7
D-80686 München
Tel:   +49 (0)89 - 548 43 33 0
Fax:   +49 (0)89 - 548 43 33 29
e-mail: haisenko@comdasys.com
http://www.comdasys.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Mar 20 13:50:08 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.