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:
5ae399d
)
before NEW THEORY
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 22 Feb 2012 10:00:16 +0000
(10:00 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 22 Feb 2012 10:00:16 +0000
(10:00 +0000)
THEORY
patch
|
blob
|
history
diff --git
a/THEORY
b/THEORY
index f5518b0e848d64b4eb95a948bed7fb83bb8498be..d0fdab59a117253dbe89f7f2a93c2047b5d8eeb2 100644
(file)
--- a/
THEORY
+++ b/
THEORY
@@
-85,3
+85,19
@@
single patch dependency application
P(C) = P(D)
inpatch(P,C) = included
+simple merge
+ make C from L, R, M
+ where
+ M < L < C
+ M < R < C
+ result
+ C >1 { L, R }
+ P(C) = P(L)
+ if Cx isin L = Cx isin R,
+ Cx isin C = Cx isin L
+ otherwise
+ Cx isin C = ! Cx isin M
+
+ cases of inpatch(P,L) and ,R
+
+ or Cx isin