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

RE: Merge issues

From: Lakshman Srilakshmanan <lakshman.srilakshmanan_at_tradingpost.com.au>
Date: 2006-09-26 07:17:33 CEST

Hi Carlos,

 

Please read the following link
http://svn.haxx.se/users/archive-2006-01/0149.shtml from Ryan Schmidt.

 

The above link helped me understand merging. If after reading the link
you are still unclear let me know and I will attempt to clear your
doubt.

 

Thanks

Lakshman

  _____

From: Negron, Carlos [mailto:carlos.negron@credit-suisse.com]
Sent: Tuesday, 26 September 2006 5:14 AM
To: 'users@subversion.tigris.org'
Subject: Merge issues

 

I'm failing to understand the merge syntax thus failing to merge my
branches predictably.

Please explain to me the exact meaning of the command:

svn merge -r 25:30 file:///repos/branch <file:///\\repos\branch>

I am basically attempting to merge from the trunk revision 1 to a
branch, but
I keep seeing my results of "A" for some files and it attempts to delete
other files
which I don't want and it also deletes portions of code that I don't
want.

Please help.

Thanks

Carlos A. Negron Jr.

========================================================================
======
Please access the attached hyperlink for an important electronic
communications disclaimer:
 
http://www.credit-suisse.com/legal/en/disclaimer_email_ib.html
========================================================================
======
Received on Tue Sep 26 07:58:58 2006

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