From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 22 Feb 2012 22:24:53 +0000 (+0000)
Subject: do not tolerate tb metadata in foreign branches
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke.git;a=commitdiff_plain;h=e0dce6d313d0ee510f00238de8abda944f8d6155;ds=sidebyside

do not tolerate tb metadata in foreign branches
---

diff --git a/DESIGN b/DESIGN
index 135cb6d..e4066e4 100644
--- a/DESIGN
+++ b/DESIGN
@@ -25,9 +25,7 @@ Patch removal:
 
 Foreign branches:
  When merging from a foreign dependency, check that it
- does not have .topbloke metadata; LATER if it
- does, could produce a new commit which has .topbloke removed
- and merge from that
+ does not have .topbloke metadata
 
 Patch naming:
  needs to be globally unique