svn commit: r222813 - in head: . contrib/top gnu/usr.bin/gdb/kgdb lib/libkvm lib/libmemstat share/man/man4 share/mk sys/amd64/acpica sys/amd64/amd64 sys/amd64/include sys/arm/arm sys/arm/include sy...

[Dimitry Andric]

On 2011-06-09 21:00, John Baldwin wrote:
> On Thursday, June 09, 2011 2:50:07 pm Andriy Gapon wrote:
>> on 09/06/2011 20:52 John Baldwin said the following:
>>> svn diff | patch (basically what folks do for branches in p4).
>>
>> svn diff doesn't always produce a diff suitable for patch.
>> I remember having to do diff -r... between two svn checkouts.
>
> Hmm, I think an svn diff between two URLs will generally DTRT though,
> but you'll want your branch up to date to reduce noise in the diff.

One problem is that svn diff does *not* expand $FreeBSD$ keywords, so
feeding these diffs to patch usually leads to at least a few failed
hunks. :)