Date: Thu, 23 Jul 2009 02:46:40 -0700 From: Brian Somers <brian@FreeBSD.org> To: Bruce Simpson <bms@incunabulum.net> Cc: svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, Bruce M Simpson <bms@FreeBSD.org>, svn-src-stable-7@FreeBSD.org Subject: Re: svn commit: r195829 - stable/7/sys/dev/usb 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>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Thu, 23 Jul 2009 02:41:05 +0100 Bruce Simpson <bms@incunabulum.net> wrote: > Hi all, > > I haven't updated the mergeinfo for this file, as the USB stack in > HEAD has been completely replaced with the new USB stack. If this is > desired, please let me know how to proceed -- I'm new to mergeinfo. > > When I used the following command to try to maintain the mergeinfo > information, I got a very large list of revisions, not all of which look > as though they should be merged for this file: > % svn merge --record-only -c182138 > $FSVN/head/sys/dev/usb/uipaq.c@182138 uipaq.c > > If I omit the @182138 from the above command, the resultant mergeinfo is > empty. > > thanks, > BMS > > P.S. I tested the code in this commit with an HP iPaq 2215 and it > 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. -- Brian Somers <brian@Awfulhak.org> Don't _EVER_ lose your sense of humour ! <brian@FreeBSD.org> [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.12 (FreeBSD) iQCVAwUBSmgxhg7tvOdmanQhAQIVYgP/dYqPUOgdQczdOuFvw1oLXSvks/yalfmW 5AcVNzs/ktcbySgZRLqQDj6cccRM1twM/MJ6W+/Z5K7EDIlVHl8EGFFRay0rB8zE NgYEEXc5SZJGlZZV1A4azB/mFIyq773KJwDeQzNAqNISPrq4HmKoDKPktWe6n+x5 rZUuRyswGec= =VBH2 -----END PGP SIGNATURE-----help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090723024640.6f5c893a>