From 3cef5f54091fb536fb77af9a33838a631fbf6738 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 30 Jan 2012 23:30:13 +0000 Subject: [PATCH] DESIGN: mention topgit a couple more times --- DESIGN | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/DESIGN b/DESIGN index a3e5c97..57f3191 100644 --- a/DESIGN +++ b/DESIGN @@ -17,7 +17,8 @@ Basic update algorithm: ii. For each source in the best order, do the following merge: (Our base has sources: - the branch for each direct dep - - the remote base) + - the remote base + - the topgit base, if this is a topgit import) Find the (latest) common ancestor. @@ -86,12 +87,14 @@ Basic update algorithm: * Attempt to apply the appropriate diff to add (resp. remove) the contents of the relevant patch (adjusted appropriately for metadata, XXX??? particularly the actual inclusion list) + XXX if we want to add a dep we need to update the dep first * Go round again looking for another discrepancy. 3. Update our branch. Our branch has sources: - our base - the remote for our branch + - the topgit branch, if this is a topgit import For each source in the best order, do the merge. Double-check the actual dependency inclusions. In -- 2.30.2