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
Brian Somers wrote:
...
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
On Thursday 23 July 2009 8:40:43 am Bruce Simpson wrote:
Brian Somers wrote:
...
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
John Baldwin wrote:
...
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.
I read them, having been pointed at them by kib@ -- but they
On Thursday 23 July 2009 3:03:38 pm Bruce Simpson wrote:
John Baldwin wrote:
...
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.
On Thu, 23 Jul 2009 20:03:38 +0100, Bruce Simpson b...@incunabulum.net wrote:
Perhaps a purchase of the Subversion book is in my future.
You can download the pdf for free - it's worth reading.
IMHO the svn:mergeinfo idea is flawed. It doesn't handle
hierarchies with mixed --depth values at all
Author: bms
Date: Thu Jul 23 01:35:13 2009
New Revision: 195829
URL: http://svn.freebsd.org/changeset/base/195829
Log:
MFC r182138:
Greatly expand the devices listed as being supported. This list was
taken from PR/121184 which was mechanically generated from similar
lists in the Linux
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
