summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-03-27 18:39:11 +0100
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-03-27 18:39:11 +0100
commit83bc9e9943f2d75fc40f36cf9396e901a3319bb5 (patch)
tree617aa8eb24f77a175440fcab85fa727184c15ed3 /doc
parenta0039e241f899f3c562a737f1bc17b305b46c422 (diff)
downloadmorph-83bc9e9943f2d75fc40f36cf9396e901a3319bb5.tar.gz
Add note that the code does not yet match the code
Diffstat (limited to 'doc')
-rw-r--r--doc/branching-merging-systems.mdwn2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/branching-merging-systems.mdwn b/doc/branching-merging-systems.mdwn
index 3e781b5a..3b024cb4 100644
--- a/doc/branching-merging-systems.mdwn
+++ b/doc/branching-merging-systems.mdwn
@@ -1,6 +1,8 @@
Branching and merging at the system level in Baserock
=====================================================
+NOTE: This is a spec. The code does not yet match it.
+
As I write this, Baserock consists of just under 70 upstream projects,
each of which we keep in their own git repository. We need a way to
manage changes to them in a sensible manner, particularly when things