chiark / gitweb /
do not tolerate tb metadata in foreign branches
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 22 Feb 2012 22:24:53 +0000 (22:24 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 22 Feb 2012 22:24:53 +0000 (22:24 +0000)
DESIGN

diff --git a/DESIGN b/DESIGN
index 135cb6d..e4066e4 100644 (file)
--- 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