From owner-svn-src-all@FreeBSD.ORG Thu Jul 23 10:15:22 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 BFC671065670; Thu, 23 Jul 2009 10:15:22 +0000 (UTC) (envelope-from prvs=144824d4a6=brian@FreeBSD.org) Received: from idcmail-mo2no.shaw.ca (idcmail-mo2no.shaw.ca [64.59.134.9]) by mx1.freebsd.org (Postfix) with ESMTP id 5BFF68FC08; Thu, 23 Jul 2009 10:15:22 +0000 (UTC) (envelope-from prvs=144824d4a6=brian@FreeBSD.org) Received: from pd6ml2no-ssvc.prod.shaw.ca ([10.0.153.163]) by pd5mo1no-svcs.prod.shaw.ca with ESMTP; 23 Jul 2009 03:47:03 -0600 X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.0 c=1 a=9hgBjiEyFVcA:10 a=4Z0QP1WVBuUwHZGQKe2N1A==:17 a=awCybExcAAAA:8 a=MMwg4So0AAAA:8 a=6I5d2MoRAAAA:8 a=tKGW4t-VMDxU3_BKpUQA:9 a=oxZ1sUjUtO-yMlPT-DzJQwY8M4sA:4 a=z2jkVXLrYuwA:10 a=WJ3hkfHDukgA:10 a=SV7veod9ZcQA:10 a=DUDImQE_u13sDucWSrcA:9 a=SAitR033TxKKAKZwAVlIbvYN7zAA:4 Received: from unknown (HELO store.lan.Awfulhak.org) ([174.7.23.140]) by pd6ml2no-dmz.prod.shaw.ca with ESMTP; 23 Jul 2009 03:47:00 -0600 Received: from store.lan.Awfulhak.org (localhost.localdomain [127.0.0.1]) by localhost (Email Security Appliance) with SMTP id 59818C43548_A68319AB; Thu, 23 Jul 2009 09:47:06 +0000 (GMT) Received: from gw.Awfulhak.org (gw.lan.Awfulhak.org [172.16.0.1]) by store.lan.Awfulhak.org (Sophos Email Appliance) with ESMTP id CDEC3C460F4_A68318FF; Thu, 23 Jul 2009 09:46:55 +0000 (GMT) Received: from dev.lan.Awfulhak.org (brian@dev.lan.Awfulhak.org [172.16.0.5]) by gw.Awfulhak.org (8.14.3/8.14.3) with ESMTP id n6N9kkUx042082; Thu, 23 Jul 2009 02:46:48 -0700 (PDT) (envelope-from brian@FreeBSD.org) Date: Thu, 23 Jul 2009 02:46:40 -0700 From: Brian Somers To: Bruce Simpson Message-ID: <20090723024640.6f5c893a@dev.lan.Awfulhak.org> In-Reply-To: <4A67BFB1.40904@incunabulum.net> References: <200907230135.n6N1ZEar057595@svn.freebsd.org> <4A67BFB1.40904@incunabulum.net> X-Mailer: Claws Mail 3.7.2 (GTK+ 2.16.4; i386-portbld-freebsd8.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/j7SZnq._V4iBURktYQh_wjy"; protocol="application/pgp-signature" Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, Bruce M Simpson , svn-src-stable-7@FreeBSD.org Subject: Re: svn commit: r195829 - stable/7/sys/dev/usb 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, 23 Jul 2009 10:15:23 -0000 --Sig_/j7SZnq._V4iBURktYQh_wjy Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Thu, 23 Jul 2009 02:41:05 +0100 Bruce Simpson wrot= e: > Hi all, >=20 > I haven't updated the mergeinfo for this file, as the USB stack in=20 > HEAD has been completely replaced with the new USB stack. If this is=20 > desired, please let me know how to proceed -- I'm new to mergeinfo. >=20 > When I used the following command to try to maintain the mergeinfo=20 > information, I got a very large list of revisions, not all of which look= =20 > as though they should be merged for this file: > % svn merge --record-only -c182138=20 > $FSVN/head/sys/dev/usb/uipaq.c@182138 uipaq.c >=20 > If I omit the @182138 from the above command, the resultant mergeinfo is= =20 > empty. >=20 > thanks, > BMS >=20 > P.S. I tested the code in this commit with an HP iPaq 2215 and it=20 > appears to work fine. It seems ok to me: brian@dev svn $ cd stable/7/sys brian@dev sys $ svn merge --record-only -c182138 ^/head/sys brian@dev sys $ svn diff Property changes on: . ___________________________________________________________________ Modified: svn:mergeinfo Merged /head/sys:r182138 Property changes on: contrib/pf ___________________________________________________________________ Modified: svn:mergeinfo Merged /head/sys/contrib/pf:r182138 brian@dev sys $ svn st M . M contrib/pf You should keep the mergeinfo on the sys directory, so the entire merge should really have been done as with the above command but without the --record-only - that would update the mergeinfo properties (as above) and patch uipaq.c in one commit. HTH. --=20 Brian Somers Don't _EVER_ lose your sense of humour ! --Sig_/j7SZnq._V4iBURktYQh_wjy Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.12 (FreeBSD) iQCVAwUBSmgxhg7tvOdmanQhAQIVYgP/dYqPUOgdQczdOuFvw1oLXSvks/yalfmW 5AcVNzs/ktcbySgZRLqQDj6cccRM1twM/MJ6W+/Z5K7EDIlVHl8EGFFRay0rB8zE NgYEEXc5SZJGlZZV1A4azB/mFIyq773KJwDeQzNAqNISPrq4HmKoDKPktWe6n+x5 rZUuRyswGec= =VBH2 -----END PGP SIGNATURE----- --Sig_/j7SZnq._V4iBURktYQh_wjy--