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

Re: using "svn merge", "svn diff", and "svn patch"

From: James Hanley <jhanley_at_dgtlrift.com>
Date: Thu, 22 Aug 2013 09:40:08 -0400

So other then tar-ing up the WC, there is no way to reproduce local changes
like this on another system? I know the example given is fairly simple,
but it could be very useful.
-Jim

On Tue, Aug 20, 2013 at 3:28 PM, Stefan Sperling <stsp_at_elego.de> wrote:

> On Tue, Aug 20, 2013 at 01:16:40PM -0400, James Hanley wrote:
> > Not sure if this is a valid operation, but should I be able to use svn
> > merge, then svn diff to create a patch, then svn patch on another branch
> > (or pristine checkout of the originating branch where the diff was
> created)
> > to create a replica of the merge operation?
>
> No. 'svn patch' is not intended to be a drop-in replacement for 'svn
> merge'.
>
> > The reason I ask is that it appears not to do that.. I get an "Skipped
> > missing target" error on one file that was added with history with the
> > merge,
>
> I guess what happened is that you didn't use the --show-copies-as-adds
> option for 'svn diff' when you created the diff. svn patch cannot handle
> copies, only additions, due to restrictions of the unidiff format.
>
> > another in the same path that doesn't error or add, and apparently
> > no mergeinfo included at all.
>
> svn patch doesn't support mergeinfo either.
> See http://subversion.tigris.org/issues/show_bug.cgi?id=3747
>
Received on 2013-08-22 15:41:12 CEST

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