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

"fake" merge

From: <blackhole_at_collab.net>
Date: Mon, 9 Feb 2009 06:41:22 -0800 (PST)

Hi
we have the following scenario
we have a main trunk and a branch we created out of the trunk that is dedicated to a specific release ( i.e ver 1.0)
now we made several change in the ver1.0 brunch and would like to merge some of them to the main trunk and some of the change not to merge

we tried using the "--record-only" option using the 2-URL merge option, it worked well on a test repository but didn't worked on our real repository
we are using 1.5.5 but our repository had suffered from several merge reintegrate problems when using the 1.5.3 ( not sure if this is related)
any idea how to do that properly ?
thanks
David

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1129332

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-09 15:55:24 CET

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