[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: David Glasser <glasser_at_davidglasser.net>
Date: 2007-09-08 22:11:39 CEST

On 9/8/07, Charles Acknin <charlesacknin@gmail.com> wrote:
> On 9/8/07, Mark Phippard <markphip@gmail.com> wrote:
> > I am still completely confused.
> >
> > Let's say I just edit 5 normal files (java/c etc..) No adds or copies
> > or anything.
> >
> > Can I make an "svnpatch" and apply it with just svn patch?
>
> No, not with *just* svn patch.
>
> If you run 'svn diff --svnpatch' against a working copy that has just
> *contextual* modifications, you'll find the same output as with 'svn
> diff'. That's because the svnpatch part of a patch only carries:
> - tree changes
> - property changes
> - binary changes
>
> (and text changes don't fall into one of these cases).
>
> From your previous post I now understand why you're confused. I think
> you thought the svnpatch block did carry text changes, which is not
> the case.

Interesting. This implies to me that for the majority of patches
(those that are just text mods), the svnpatch block is just a no-op!

Thus there are three types of patches: those which just need an
external patch tool to apply (text mods only), those which just need
'svn patch' to apply (no text mods), and those which need both.
Perhaps 'svn patch' should include a header saying which one this is?

--dave

-- 
David Glasser | glasser_at_davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Sep 8 22:08:18 2007

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