chiark
/
gitweb
/
~ian
/
topbloke.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
468972c
)
DESIGN: mention topgit a couple more times
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 30 Jan 2012 23:30:13 +0000
(23:30 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 30 Jan 2012 23:30:13 +0000
(23:30 +0000)
DESIGN
patch
|
blob
|
history
diff --git
a/DESIGN
b/DESIGN
index a3e5c978d6f3be441bdb38b92bbe104b36bcbb2d..57f3191e23f1282d5b76fc75dd9084128071a52a 100644
(file)
--- 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
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.
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)
* 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
* 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
For each source in the best order, do the merge.
Double-check the actual dependency inclusions. In