From owner-svn-src-all@FreeBSD.ORG Wed Apr 8 12:50:08 2009 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 36D8A106566B for ; Wed, 8 Apr 2009 12:50:08 +0000 (UTC) (envelope-from p.pisati@oltrelinux.com) Received: from contactlab34-bk-3.contactlab.it (contactlab34-bk-3.contactlab.it [93.94.34.3]) by mx1.freebsd.org (Postfix) with ESMTP id B1BAD8FC1E for ; Wed, 8 Apr 2009 12:50:07 +0000 (UTC) (envelope-from p.pisati@oltrelinux.com) DKIM-Signature: v=1; a=rsa-sha1; d=contactlab.it; s=s768; c=simple/simple; q=dns/txt; i=@contactlab.it; t=1239193712; h=From:Subject:Date:To:MIME-Version:Content-Type; bh=dIU/hFccG1jBUVQtVkEPllwnrI4=; b=ZbeBJlC/vxUsPh6uXP5jXCvISopuRPd0/EYY7IlKImiKuprHtiZ/wP+KmqAGFA7j GiT3sHfKEOQoveqq9ROS0iuivlLLWN1YrHvcduHzXVKBWkAiDFmIb/AoYlrKQqkS; Received: from [213.92.0.53] ([213.92.0.53:53209] helo=mail0.tomato.it) by vmta3.contactlab.it (envelope-from ) (ecelerity 2.2.2.37 r(28822M)) with ESMTP id 1B/FC-11151-0789CD94; Wed, 08 Apr 2009 14:28:32 +0200 Received: from ferret.tomato.lan (fast.tomato.it [62.101.64.91]) by mail0.tomato.it (Postfix) with ESMTP id F18C72841D; Wed, 8 Apr 2009 14:29:05 +0200 (CEST) Message-ID: <49DC9865.7080303@oltrelinux.com> Date: Wed, 08 Apr 2009 14:28:21 +0200 From: Paolo Pisati User-Agent: Thunderbird 2.0.0.19 (X11/20090226) MIME-Version: 1.0 To: Andrew Thompson References: <200904052124.n35LOF7S034434@svn.freebsd.org> <20090406002229.GD52408@citylink.fud.org.nz> In-Reply-To: <20090406002229.GD52408@citylink.fud.org.nz> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Paolo Pisati Subject: Re: svn commit: r190749 - in head/sys: dev/ata dev/sound/usb dev/usb dev/usb/bluetooth dev/usb/controller dev/usb/input dev/usb/misc dev/usb/net dev/usb/quirk dev/usb/serial dev/usb/storage dev/usb/tem... 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: Wed, 08 Apr 2009 12:50:08 -0000 Andrew Thompson wrote: > On Sun, Apr 05, 2009 at 09:24:15PM +0000, Paolo Pisati wrote: > >> Author: piso >> Date: Sun Apr 5 21:24:15 2009 >> New Revision: 190749 >> URL: http://svn.freebsd.org/changeset/base/190749 >> >> Log: >> Remove pointeless mergeinfo that crept in from r190633. >> > > Thanks! I was told this is a result of using 'svn mv' locally, can we > get instructions out about how to do this properly. > sorry, can't help you, but to revert the empty mergeinfo you have to: svn merge -c -$rev $file what i find annoying is the commit message left in the commit logs of the contaminated files, but i think it can't be fixed by normal users. -- bye, P.