Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Jul 2009 13:40:43 +0100
From:      Bruce Simpson <bms@incunabulum.net>
To:        Brian Somers <brian@FreeBSD.org>
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:  <4A685A4B.9070201@incunabulum.net>
In-Reply-To: <20090723024640.6f5c893a@dev.lan.Awfulhak.org>
References:  <200907230135.n6N1ZEar057595@svn.freebsd.org>	<4A67BFB1.40904@incunabulum.net> <20090723024640.6f5c893a@dev.lan.Awfulhak.org>

next in thread | previous in thread | raw e-mail | index | archive | help
Brian Somers wrote:
> ...
> 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.
>   

Why would this commit update contrib/pf? This looks spurious.

I got a lot more revisions than this (especially ones listed well after 
the new USB merge) in the mergeinfo output, therefore I did not commit 
the mergeinfo update. Too many to list here ATM.

thanks,
BMS



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4A685A4B.9070201>