On Thu, 23 Jul 2009 02:41:05 +0100 Bruce Simpson <b...@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/uipa...@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: br...@dev svn $ cd stable/7/sys br...@dev sys $ svn merge --record-only -c182138 ^/head/sys br...@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 br...@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 <br...@awfulhak.org> Don't _EVER_ lose your sense of humour ! <br...@freebsd.org>
signature.asc
Description: PGP signature