Index: ROADMAP.txt =================================================================== --- ROADMAP.txt (revision 221477) +++ ROADMAP.txt (revision 221478) @@ -1,132 +1,45 @@ $FreeBSD$ Repository root is: http://svn.freebsd.org/viewvc/base/ (browser, like cvsweb) http://svn.freebsd.org/base/ (readonly, DAV server) svn+ssh://svn.freebsd.org/base/ (committer access) Key locations: head/ - equivalent of cvs HEAD revision. Exported to cvs. stable/ - where the xxx-stable branches live. release/ - where release branches live releng/ - where release engineering happens user/$user/ - semi-private per-developer area projects/ - public long-term side development projects vendor/ - origin tree for vendor imports vendor-crypto/ - import area for code with export restrictions vendor-sys/ - import area for the kernel vendor-cddl/ - cddl license seggregation area cvs2svn/ - unclassified stuff / leftovers for deleting. -^^^ Only head is currently enabled for commits. - Basic branch strategy: head/ is the mainline, or current. head/ is branched/copied into stable/X. This is what will become the -stable branch. eg: stable/8 -> RELENG_8. Exported. stable/X is branched/copied into releng/X.Y. This is the release engineering branch, becoming errata/security/patch branch. eg: releng/8.0 -> RELENG_8_0. Exported. releng/X.Y.Z is branched to release/X.Y.Z. This is a release tag. Manual cvs operations are required to set tag. eg: release/8.0.0 -> RELENG_8_0_0_RELEASE. Not exported. vendor/${acme}/dist vendor import area. Copied/branched into head/. /dist is the current release, without freebsd mods. vendor/${acme}/dist is 'tagged' via copies to vendor/{$acme}/${release} -Stable: - stable/2.0.5/ - stable/2.1/ - stable/2.2/ - stable/3/ - stable/4/ - stable/5/ - stable/6/ - stable/7/ - -Releases: - release/2.0/ (branched from head/) - release/2.0.5/ (branched from releng/2.0.5/) - release/2.1.0/ (branched from stable/2.1/) - release/2.1.5/ (branched from stable/2.1/) - release/2.1.6.1/ (branched from stable/2.1/) - release/2.1.7/ (branched from stable/2.1/) - release/2.1.8/ (branched from stable/2.1/) - release/2.2.0/ (branched from stable/2.2/) - release/2.2.1/ (branched from stable/2.2/) - release/2.2.2/ (branched from stable/2.2/) - release/2.2.5/ (branched from stable/2.2/) - release/2.2.6/ (branched from stable/2.2/) - release/2.2.7/ (branched from stable/2.2/) - release/2.2.8/ (branched from stable/2.2/) - release/3.0.0/ (branched from stable/3/) - release/3.1.0/ (branched from stable/3/) - release/3.2.0/ (branched from stable/3/) - release/3.3.0/ (branched from stable/3/) - release/3.4.0/ (branched from stable/3/) - release/3.5.0/ (branched from stable/3/) - release/4.0.0/ (branched from stable/4/) - release/4.1.0/ (branched from stable/4/) - release/4.1.1/ (branched from stable/4/) - release/4.2.0/ (branched from stable/4/) - release/4.3.0/ (branched from stable/4/) - release/4.4.0/ (branched from releng/4.4/) - release/4.5.0/ (branched from releng/4.5/) - release/4.6.0/ (all below are from their releng/*) - release/4.6.1/ - release/4.6.2/ - release/4.7.0/ - release/4.8.0/ - release/4.9.0/ - release/4.10.0/ - release/4.11.0/ - release/5.0.0/ - release/5.1.0/ - release/5.2.0/ - release/5.2.1/ - release/5.3.0/ - release/5.4.0/ - release/5.5.0/ - release/6.0.0/ - release/6.1.0/ - release/6.2.0/ - release/6.3.0/ - release/7.0.0/ - -Release Engineering / Errata branches: - releng/ALPHA_2_0 (branched from head/) - releng/BETA_2_0 (branched from head/) - releng/2.0.5 (branched from head/) - releng/4.3 (branched from stable/4/) - releng/4.4 (branched from stable/4/) - releng/4.5 (branched from stable/4/) - releng/4.6 (branched from stable/4/) - releng/4.7 (branched from stable/4/) - releng/4.8 (branched from stable/4/) - releng/4.9 (branched from stable/4/) - releng/4.10 (branched from stable/4/) - releng/4.11 (branched from stable/4/) - releng/5.0 (branched from head/) - releng/5.1 (branched from head/) - releng/5.2 (branched from head/) - releng/5.3 (branched from stable/5/) - releng/5.4 (branched from stable/5/) - releng/5.5 (branched from stable/5/) - releng/6.0 (branched from stable/6/) - releng/6.1 (branched from stable/6/) - releng/6.2 (branched from stable/6/) - releng/6.3 (branched from stable/6/) - releng/7.0 (branched from stable/7/) - Vendor layout: vendor/$vendor - roots for a given vendor import vendor/$vendor/dist - staging area for importes to head/ and branches vendor/$vendor/$tag1 - location of import of version $tag1 vendor/$vendor/$tag2 - .. .. vendor/$vendor/$tagN - .. for each import -