From owner-svn-src-all@FreeBSD.ORG Thu Jun 9 17:57:32 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06D95106566B; Thu, 9 Jun 2011 17:57:32 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.161.182]) by mx1.freebsd.org (Postfix) with ESMTP id 748628FC14; Thu, 9 Jun 2011 17:57:31 +0000 (UTC) Received: by gxk28 with SMTP id 28so1352545gxk.13 for ; Thu, 09 Jun 2011 10:57:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=QyTf4BkZMVALMsK5UEdBglDsz4rvmETktkqsuaVo2bY=; b=MS5RPeYrCMmHSyXjQuWV+74YRFJbETvtoV9Lo76dUzo4fcFPuCAZ9Ig7APVu/inM1M /0gsyrbscjWE3WAvUDWxclUcPMV0rzaUubyn3J2O/giQKCnQY1kXukL+7g8D/sqUKnPT zO57ikMuLn+8zzauetIQr6bKSSoDGhF0YL3qM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=GNpuT35+34xJtgVkCYqiCpSVxE2xGhuBqLww1thgU3TotygTZWnUCZhycg2D+gIv0S DJrn8mlGTsiG7xORXvmz4RkLEAbKcOfZkAa3npFVx6IUPzpyuIXMoyuBbC7aZ02uB5rt Jm97bKzTvyvjejrowm/QoRIYJxd285gPRiGRI= MIME-Version: 1.0 Received: by 10.236.201.129 with SMTP id b1mr1620571yho.88.1307642250449; Thu, 09 Jun 2011 10:57:30 -0700 (PDT) Sender: asmrookie@gmail.com Received: by 10.236.67.81 with HTTP; Thu, 9 Jun 2011 10:57:30 -0700 (PDT) In-Reply-To: <201106091352.04738.jhb@freebsd.org> References: <201106070846.p578kD4K073476@svn.freebsd.org> <201106090843.28669.jhb@freebsd.org> <201106091352.04738.jhb@freebsd.org> Date: Thu, 9 Jun 2011 13:57:30 -0400 X-Google-Sender-Auth: ImxR0W1c3vJENMmamJ3ZoLeZv7U Message-ID: From: Attilio Rao To: John Baldwin Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jun 2011 17:57:32 -0000 2011/6/9 John Baldwin : > On Thursday, June 09, 2011 12:48:30 pm Attilio Rao wrote: >> 2011/6/9 John Baldwin : >> > 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