Date: Thu, 9 Jun 2011 13:57:30 -0400 From: Attilio Rao <attilio@freebsd.org> To: John Baldwin <jhb@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: 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... Message-ID: <BANLkTimCjvsZM9jfjRHOU45UZS6gSjW9iw@mail.gmail.com> In-Reply-To: <201106091352.04738.jhb@freebsd.org> References: <201106070846.p578kD4K073476@svn.freebsd.org> <201106090843.28669.jhb@freebsd.org> <BANLkTinFViUjOSUAcR2aFzhO6nYcnN7Cbg@mail.gmail.com> <201106091352.04738.jhb@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
2011/6/9 John Baldwin <jhb@freebsd.org>: > On Thursday, June 09, 2011 12:48:30 pm Attilio Rao wrote: >> 2011/6/9 John Baldwin <jhb@freebsd.org>: >> > On Tuesday, June 07, 2011 4:46:13 am Attilio Rao wrote: >> >> Author: attilio >> >> Date: Tue Jun =C2=A07 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. =C2= =A0I suspect >> > svn merge --reintegrate is too broken to be used safely and should pro= bably >> > 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 file= s > after the svn merge. =C2=A0If so perhaps we could just recommend that fol= ks check > for that and fall back to diff | patch if they notice those sorts of prob= lems > instead. I did svn status on the branch and didn't actually find anything, if it can help. Attilio --=20 Peace can only be achieved by understanding - A. Einstein
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?BANLkTimCjvsZM9jfjRHOU45UZS6gSjW9iw>