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

Re: Problems with merge - nothing happens?

From: Greg Goodrich <ggoodrich_at_medinotes.com>
Date: 2004-11-11 21:49:00 CET

The one piece of info that seems to be missing is what is your working
copy pointing to? I think all are assuming that you have a working copy
pointing to trunk. Double check that. Then the following should work:
    svn merge -rN:M branch .

I am fairly new to subversion, but I don't think the following syntax is
what you want at all:
   svn merge $R/pos/tags/pos.AUTH_RETALIX_R1_2_P10@3875 $R/pos/trunk .

Ken Miller wrote:

> Walden Mathews wrote:
>
>> | If I do this:
>> | | svn diff $R/pos/tags/pos.AUTH_RETALIX_R1_2_P10 $R/pos/trunk
>> | | I see a list of differences. What I want to do is take the
>> differences | from the tagged branch, and merge them with the code on
>> the trunk
>> There are basically two useful things you can do with merge
>> and these two branches, and a working copy of the trunk:
>>
>> (1) you can apply changes made in the branch to your
>> trunk. "svn merge -rN:M branch ."
>>
>>
> This one is what I want to do. Change have been made to a piece of
> in-production code, and my co-worker wants to migrate the changes into
> the trunk of the development version.
>
>> (2) you can make your trunk look exactly like the head of
>> your branch. "svn merge trunk branch ."
>>
>>
> I do this regularly when I'm making my fixes to various trees of code,
> using the
>
> svn merge -r start:end REPOS-PATH WC
>
> incantation of the merge command. Works fine for me - this is why I'm
> confused about why it won't work for this current situation, which to
> me seems like the same thing.
>
>> Which one are you trying to do?
>>
>> Walden Mathews
>>
>>
> Cheers!
>
> -klm.
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org

-- 
*Greg Goodrich*
Development Manager
*MediNotes Corporation*
1025 Ashworth Road, Suite 222
West Des Moines, IA 50265
Phone: 515.327.8850 ext. 251/
/Fax: 515.327.8856
	
<http://www.medinotes.com>
*Charting Plus - "The Best EMR Value on the Market!"
**www.medinotes.com* <http://www.medinotes.com/>
 
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Nov 11 21:49:22 2004

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