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

Re: svn diff --svnpatch & svn patch

From: Charles Acknin <charlesacknin_at_gmail.com>
Date: 2007-09-08 16:17:22 CEST

On 9/8/07, Mark Phippard <markphip@gmail.com> wrote:
> I am still confused about the GNU patch part. Does svn patch apply
> the patch if you do not have GNU patch or does it require it? Is GNU
> patch just required for people that want to apply a patch from the
> unidiff? Is there any difference in the outcome?

GNU patch is not required. We didn't solve the problem of applying
unidiff yet (not all the platforms Subversion supports have GNU patch;
injecting GNU patch into Subversion would raise at least licensing
questions) , so I did rather leave the unidiff part aside (and let the
user deal with it with her/his own tools). Put differently, we have
three use-cases depending on whether the input you're feeding 'svn
patch' with is:
  1. unidiff only : 'svn patch' does nothing.
  2. unidiff+svnpatch: 'svn patch' parses the input until it finds
svnpatch bytes, and processes these. The unidiff bytes are ignored.
  3. svnpatch only: 'svn patch' processes svnpatch bytes.

To sum up: Subversion handles the svnpatch bytes and the user is free
to run e.g. GNU patch against the unidiff part of the patch.

Cheers,
Charles

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Sep 8 16:14:03 2007

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