Merge a single changeset

[Jon Drukman <jd...@gmail.com>]

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?

-jsd-


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Merge a single changeset

[Mark Phippard <ma...@gmail.com>]

On Wed, Oct 29, 2008 at 5:51 PM, Jon Drukman <jd...@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@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org