Date: Thu, 23 Jul 2009 10:23:46 -0400 From: John Baldwin <jhb@freebsd.org> To: Bruce Simpson <bms@incunabulum.net> Cc: svn-src-stable-7@freebsd.org, Brian Somers <brian@freebsd.org>, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Bruce M Simpson <bms@freebsd.org> Subject: Re: svn commit: r195829 - stable/7/sys/dev/usb Message-ID: <200907231023.47428.jhb@freebsd.org> In-Reply-To: <4A685A4B.9070201@incunabulum.net> References: <200907230135.n6N1ZEar057595@svn.freebsd.org> <20090723024640.6f5c893a@dev.lan.Awfulhak.org> <4A685A4B.9070201@incunabulum.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thursday 23 July 2009 8:40:43 am Bruce Simpson wrote: > 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. This is a FAQ at this point and has been discussed multiple times in the archives, but it is correct. > 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. That's because you merged to the file rather than to sys/. There's a set of instructions about mergning with SVN on the wiki that explains why to do kernel merges to sys/ instead of individual files. -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907231023.47428.jhb>