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...

[John Baldwin]

On Thursday, June 09, 2011 12:48:30 pm Attilio Rao wrote:
> 2011/6/9 John Baldwin <jhb at freebsd.org>:
> > On Tuesday, June 07, 2011 4:46:13 am Attilio Rao wrote:
> >> Author: attilio
> >> Date: Tue Jun  7 08:46:13 2011
> >> New Revision: 222813
> >> URL: http://svn.freebsd.org/changeset/base/222813
> >>
> > It would appear that svn destroyed the history on all these files.  I suspect
> > svn merge --reintegrate is too broken to be used safely and should probably
> > not be used in the future until/unless svn fixes it to not suck.
> 
> That was suggested by re@ officials, so I can't really argue :)

Well, I don't think it has blown up in the past, so at the time that
recommendation was probably fine.

> What would you use instead? the "write me" option?

svn diff | patch (basically what folks do for branches in p4).

I'm not sure if svn stat would have shown an unusual state for these files
after the svn merge.  If so perhaps we could just recommend that folks check
for that and fall back to diff | patch if they notice those sorts of problems
instead.

-- 
John Baldwin