Date: Thu, 9 Jun 2011 15:28:25 -0600 From: Warner Losh <imp@bsdimp.com> To: John Baldwin <jhb@freebsd.org> Cc: Attilio Rao <attilio@freebsd.org>, 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: <1FCA7CC7-3B61-4379-96BB-6E8976B9983A@bsdimp.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
On Jun 9, 2011, at 11:52 AM, John Baldwin wrote: > 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 7 08:46:13 2011 >>>> New Revision: 222813 >>>> URL: http://svn.freebsd.org/changeset/base/222813 >>>>=20 >>> 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. >>=20 >> That was suggested by re@ officials, so I can't really argue :) >=20 > Well, I don't think it has blown up in the past, so at the time that > recommendation was probably fine. >=20 >> What would you use instead? the "write me" option? >=20 > svn diff | patch (basically what folks do for branches in p4). BTW, I discovered similar things when I was doing the mips work on a = branch... svn is good for 'dolphin' branches, but not so good when you want to = cherry pick changes back to the main while you are also pulling changes = from the main. Warner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1FCA7CC7-3B61-4379-96BB-6E8976B9983A>