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

Re: Merge a single changeset

From: Mark Phippard <markphip_at_gmail.com>
Date: Wed, 29 Oct 2008 18:15:31 -0400

On Wed, Oct 29, 2008 at 5:51 PM, Jon Drukman <jdrukman_at_gmail.com> wrote:
> I am having problems trying to merge a single change. in r4238 i changed
> one line in one file. Trying to merge from a branch back to the trunk...
>
> $ pwd
> /svn/trunk
>
> $ svn merge -r4238:HEAD http://svn.thism.com/svn/branches/beta2
> Conflict discovered in 'docroot/css/style.css'.
> Select: (p) postpone, (df) diff-full, (e) edit,
> (h) help for more options:
>
>
> And it keeps going on, complaining about dozens of files. This is not the
> file that I changed. How do I bring over changes one at a time?

The correct syntax would be either "-c 4238" or "-r 4237:4238"

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-10-29 23:15:53 CET

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