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:
e9bcefd
)
fix a few bugs in THEORY
master
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 26 Feb 2012 00:41:51 +0000
(
00:41
+0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 26 Feb 2012 00:41:51 +0000
(
00:41
+0000)
THEORY
patch
|
blob
|
history
diff --git
a/THEORY
b/THEORY
index 4478fa064937a2b9a017b6526819a5a44efa50dc..13c20af1cf6e2c98d8e696761cbb3cf7419371c0 100644
(file)
--- a/
THEORY
+++ b/
THEORY
@@
-3,11
+3,12
@@
GENERAL
C >= D C is descendant of D, partial order
D \isin C C contains changes from D, partial order
Patch P has two sets P+, P-
C >= D C is descendant of D, partial order
D \isin C C contains changes from D, partial order
Patch P has two sets P+, P-
- Ancestors A(C,P) = { Ca \elem
C | Ca \elem P
}
- Ends E(C,P) = maximal elements of A(C,P)
+ Ancestors A(C,P) = { Ca \elem
P | Ca <= C
}
+ Ends E(C,P) =
<=-
maximal elements of A(C,P)
Patch inclusion
C \haspatch P <=> [ \forall D \elem P+: D \isin C <=> D <= C ]
C \nothaspatch P <=> [ \forall D \elem P+: D \notisin C ]
Patch inclusion
C \haspatch P <=> [ \forall D \elem P+: D \isin C <=> D <= C ]
C \nothaspatch P <=> [ \forall D \elem P+: D \notisin C ]
+ and we maintain C \haspatch P v C \nothaspatch P
COMMIT ANNOTATIONS
COMMIT ANNOTATIONS