Module Name: othersrc
Committed By: dholland
Date: Thu Mar 6 05:24:08 UTC 2014
Modified Files:
othersrc/external/bsd/bikeshed/dist/design: requirements.txt
Log Message:
a couple minor adjustments, sitting around since last july
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
othersrc/external/bsd/bikeshed/dist/design/requirements.txt
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/bikeshed/dist/design/requirements.txt
diff -u othersrc/external/bsd/bikeshed/dist/design/requirements.txt:1.2 othersrc/external/bsd/bikeshed/dist/design/requirements.txt:1.3
--- othersrc/external/bsd/bikeshed/dist/design/requirements.txt:1.2 Fri May 24 08:25:11 2013
+++ othersrc/external/bsd/bikeshed/dist/design/requirements.txt Thu Mar 6 05:24:08 2014
@@ -178,7 +178,7 @@ in up front.
Branches that are intended to diverge (releases, for example, or
outright project forks) are fundamentally different from branches that
-are expected to reconnect to their parent (b.g. feature development
+are expected to reconnect to their parent (e.g. feature development
branches) once the version control system has any kind of branch
management or tracking support.
@@ -197,7 +197,8 @@ capable of listing the ones that haven't
possible action. There is absolutely no reason, however, that the
version control system shouldn't be able to provide this information.
AIUI, for release branches releng currently has to maintain this
-metadata by hand.
+metadata by hand. (Update: "no existing ..." may actually be "no
+existing free ...".)
If you duplicate a file, such as cloning a device driver template file
for a new driver, or starting a new pmap by copying an old one,
