[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: Negron, Carlos <carlos.negron_at_credit-suisse.com>
Date: 2006-09-26 19:15:52 CEST

Lakshman,
 
Thanks for you reply. I read the link and got a deeper understanding of how "svn merge -r <num>:<num>" would work.
So it partially answered my question. Also the link focused on using some tool, I am using the command line on Unix.
 
You see I understand this syntax: svn merge <url>@verA <url>@verB
 
Based on the link below command will take files verA and compare them to verB. This issue I found with this type of
merge is, for example: verA of file foo.c has lines of code I want to keep. verB has new functionality but does not
have the code I want to keep from verA. So I want to merge. Thus when I do a merge the code that I want to keep
gets deleted. I would at least expect a conflict. Also my working repository is the branch that contains verB.
This also happens vice versa.
 
What I don't understand is this syntax: svn merge -r verA:verB url@ver <mailto:url@ver>
 
Can you clarify this syntax as the documentation clearly explains the -r options but not what the url@ver <mailto:url@ver> indicates?
 
Please let me know.
 
thanks
Carlos

  _____

From: Lakshman Srilakshmanan [mailto:lakshman.srilakshmanan@tradingpost.com.au]
Sent: Tuesday, September 26, 2006 1:18 AM
To: Negron, Carlos
Cc: users@subversion.tigris.org
Subject: RE: Merge issues

Hi Carlos,

 

Please read the following link http://svn.haxx.se/users/archive-2006-01/0149.shtml <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
==============================================================================

==============================================================================
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 19:17:04 2006

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