chiark / gitweb /
Ian Jackson [Sun, 18 Mar 2012 11:43:36 +0000 (11:43 +0000)]
revid - use "git foo" not "git-foo"
Ian Jackson [Sun, 18 Mar 2012 11:29:20 +0000 (11:29 +0000)]
revid - better deps
Ian Jackson [Sun, 18 Mar 2012 11:27:58 +0000 (11:27 +0000)]
make clean - remove *.ps
Ian Jackson [Sun, 18 Mar 2012 11:27:23 +0000 (11:27 +0000)]
revid - include
Ian Jackson [Sun, 18 Mar 2012 11:26:58 +0000 (11:26 +0000)]
revid - make more suitable for us
Ian Jackson [Sun, 18 Mar 2012 11:15:28 +0000 (11:15 +0000)]
.git-revid from my trains.git
Ian Jackson [Sun, 18 Mar 2012 11:10:13 +0000 (11:10 +0000)]
more sophisticated makefile (make once etc.)
Ian Jackson [Sun, 18 Mar 2012 11:00:01 +0000 (11:00 +0000)]
merge coherence complex - remove unneeded ref to def of haspatch
Ian Jackson [Sun, 18 Mar 2012 10:59:16 +0000 (10:59 +0000)]
merge coherence complex - fix proof intro re haspatch nonexclusivity
Ian Jackson [Sun, 18 Mar 2012 10:55:40 +0000 (10:55 +0000)]
fix non-topbloke merges empty ends proof
Ian Jackson [Sun, 18 Mar 2012 10:51:23 +0000 (10:51 +0000)]
rationalise patch notation names - anticommit
Ian Jackson [Sun, 18 Mar 2012 10:51:07 +0000 (10:51 +0000)]
provide \pl etc.
Ian Jackson [Sun, 18 Mar 2012 10:44:03 +0000 (10:44 +0000)]
rationalise patch notation names - annotations
Ian Jackson [Fri, 16 Mar 2012 23:47:45 +0000 (23:47 +0000)]
rename Tip Self Contents -> Tip Own Contents
Ian Jackson [Fri, 16 Mar 2012 23:46:59 +0000 (23:46 +0000)]
rename Tip Self Inpatch -> Tip Self Contents
Ian Jackson [Fri, 16 Mar 2012 23:45:16 +0000 (23:45 +0000)]
small fixes
Ian Jackson [Fri, 16 Mar 2012 23:39:37 +0000 (23:39 +0000)]
non-topbloke merges fix merge ends proof
Ian Jackson [Fri, 16 Mar 2012 23:14:18 +0000 (23:14 +0000)]
be more rigorous about conformance
Ian Jackson [Fri, 16 Mar 2012 23:00:18 +0000 (23:00 +0000)]
add note about non-exclusivity of \haspatch and \nothaspatch
Ian Jackson [Fri, 16 Mar 2012 23:00:00 +0000 (23:00 +0000)]
use new extended Self Tip Inpatch
Ian Jackson [Fri, 16 Mar 2012 22:53:39 +0000 (22:53 +0000)]
extend Self Tip Inpatch
Ian Jackson [Fri, 16 Mar 2012 22:43:22 +0000 (22:43 +0000)]
remove a couple of spurious $\qed$
Ian Jackson [Fri, 16 Mar 2012 22:40:45 +0000 (22:40 +0000)]
remove spurious .
Ian Jackson [Fri, 16 Mar 2012 22:34:19 +0000 (22:34 +0000)]
merge fixes/clarifications - clarify and fix tip contents R \in \py
Ian Jackson [Fri, 16 Mar 2012 22:28:31 +0000 (22:28 +0000)]
merge fixes/clarifications - clarify tip contents R \not\in \py
Ian Jackson [Fri, 16 Mar 2012 22:25:11 +0000 (22:25 +0000)]
merge fixes/clarifications - sort out complex case D = C
Ian Jackson [Fri, 16 Mar 2012 22:00:55 +0000 (22:00 +0000)]
merge fixes/clarifications - fix several P to \p
Ian Jackson [Fri, 16 Mar 2012 21:59:19 +0000 (21:59 +0000)]
merge fixes/clarifications - remove wrong "on R"
Ian Jackson [Fri, 16 Mar 2012 21:59:10 +0000 (21:59 +0000)]
merge fixes/clarifications - add missing \
Ian Jackson [Fri, 16 Mar 2012 21:57:23 +0000 (21:57 +0000)]
merge fixes/clarifications - clarify Non-Topbloke merges - add a wlog
Ian Jackson [Fri, 16 Mar 2012 21:55:51 +0000 (21:55 +0000)]
merge fixes/clarifications - clarify Non-Topbloke merges
Ian Jackson [Fri, 16 Mar 2012 21:55:38 +0000 (21:55 +0000)]
merge fixes/clarifications - relax Foreign Merges
Ian Jackson [Fri, 16 Mar 2012 21:55:25 +0000 (21:55 +0000)]
merge fixes/clarifications - change , to \land
Ian Jackson [Fri, 16 Mar 2012 21:47:37 +0000 (21:47 +0000)]
split into multiple source files
Ian Jackson [Fri, 16 Mar 2012 21:36:15 +0000 (21:36 +0000)]
remove a spurious \newpage
Ian Jackson [Thu, 15 Mar 2012 19:20:27 +0000 (19:20 +0000)]
merge ends conditions change order of precondition to put M in middle, for clarity
Ian Jackson [Thu, 15 Mar 2012 19:19:17 +0000 (19:19 +0000)]
wording improvement
Ian Jackson [Thu, 15 Mar 2012 19:19:07 +0000 (19:19 +0000)]
mention that merge can be used for dependency reinsertion
Ian Jackson [Thu, 15 Mar 2012 19:14:25 +0000 (19:14 +0000)]
Revert "rename anticommit section"
This reverts commit
8649610cb4d7ce51cda5040bf9f17c05636b016f.
Ian Jackson [Thu, 15 Mar 2012 19:14:03 +0000 (19:14 +0000)]
Revert all "wip dependency insertion"
This is actually a subcase of Merge.
Revert "wip dependency insertion"
This reverts commit
12818e0da31738adbaecf129c1e697633d371cf8.
Revert "wip dependency insertion"
This reverts commit
c39f3f1f5a5df2a4d628f335f7aaad44c0f68913.
Revert "wip dependency insertion"
This reverts commit
e41fe6dd695b0354aa46929828f0d4ffd604f643.
Revert "wip dependency insertion"
This reverts commit
2e2c0cd70b9a6819e2289a7b07addb6e19f5012c.
Revert "wip dependency insertion"
This reverts commit
d357159ce17651ed7deba459e32400636973b827.
Revert "wip dependency insertion"
This reverts commit
c759fdf5965e18b0fc6f713b22526ec9464ed7f7.
Revert "wip dependency insertion"
This reverts commit
de686ee8ee88dade41eb58f604a89f901b3a13a1.
Revert "wip dependency insertion"
This reverts commit
fc96ba0c73d771839a025fc5cb771554cf178eaa.
Ian Jackson [Wed, 14 Mar 2012 23:22:20 +0000 (23:22 +0000)]
wip dependency insertion
Ian Jackson [Wed, 14 Mar 2012 23:18:50 +0000 (23:18 +0000)]
wip dependency insertion
Ian Jackson [Wed, 14 Mar 2012 23:12:18 +0000 (23:12 +0000)]
wip dependency insertion
Ian Jackson [Wed, 14 Mar 2012 22:10:04 +0000 (22:10 +0000)]
wip dependency insertion
Ian Jackson [Wed, 14 Mar 2012 18:37:49 +0000 (18:37 +0000)]
wip dependency insertion
Ian Jackson [Wed, 14 Mar 2012 18:35:06 +0000 (18:35 +0000)]
wip dependency insertion
Ian Jackson [Wed, 14 Mar 2012 18:30:42 +0000 (18:30 +0000)]
wip dependency insertion
Ian Jackson [Wed, 14 Mar 2012 18:27:25 +0000 (18:27 +0000)]
wip dependency insertion
Ian Jackson [Wed, 14 Mar 2012 18:20:13 +0000 (18:20 +0000)]
rename anticommit section
Ian Jackson [Mon, 12 Mar 2012 18:04:51 +0000 (18:04 +0000)]
more clarifications and fixes from reread
Ian Jackson [Mon, 12 Mar 2012 17:59:57 +0000 (17:59 +0000)]
more clarifications and fixes from reread
Ian Jackson [Mon, 12 Mar 2012 17:59:28 +0000 (17:59 +0000)]
more clarifications and fixes from reread
Ian Jackson [Mon, 12 Mar 2012 17:02:50 +0000 (17:02 +0000)]
clarifications and fixes from reread
Ian Jackson [Mon, 12 Mar 2012 16:11:41 +0000 (16:11 +0000)]
improve wording
Ian Jackson [Mon, 12 Mar 2012 16:09:29 +0000 (16:09 +0000)]
improve wording
Ian Jackson [Mon, 12 Mar 2012 16:06:18 +0000 (16:06 +0000)]
create base: remove ingredients condition
Ian Jackson [Mon, 12 Mar 2012 16:03:36 +0000 (16:03 +0000)]
create base: strengthen create acyclic condition
Ian Jackson [Mon, 12 Mar 2012 15:53:40 +0000 (15:53 +0000)]
formatting: a couple of extra [ ]
Ian Jackson [Mon, 12 Mar 2012 15:50:59 +0000 (15:50 +0000)]
formatting: section headings on lh pages too
Ian Jackson [Mon, 12 Mar 2012 15:36:53 +0000 (15:36 +0000)]
in simple commit rename parent from A to L
Ian Jackson [Mon, 12 Mar 2012 15:35:30 +0000 (15:35 +0000)]
add purported proof of calculation of ends
Ian Jackson [Mon, 12 Mar 2012 15:34:45 +0000 (15:34 +0000)]
fix calculation of ends formula
Ian Jackson [Mon, 12 Mar 2012 15:17:46 +0000 (15:17 +0000)]
assert that exact ancestors is trivial
Ian Jackson [Mon, 12 Mar 2012 15:15:51 +0000 (15:15 +0000)]
proof of alternative merge formulation
Ian Jackson [Mon, 12 Mar 2012 15:15:37 +0000 (15:15 +0000)]
remove trailing ws
Ian Jackson [Mon, 12 Mar 2012 14:52:51 +0000 (14:52 +0000)]
create tip
Ian Jackson [Mon, 12 Mar 2012 14:51:27 +0000 (14:51 +0000)]
simple commit foreign inclusion use simple foreign inclusion
Ian Jackson [Mon, 12 Mar 2012 14:48:50 +0000 (14:48 +0000)]
introduce and use Totally Foreign Contents
Ian Jackson [Mon, 12 Mar 2012 14:38:24 +0000 (14:38 +0000)]
wip create tip
Ian Jackson [Mon, 12 Mar 2012 14:37:47 +0000 (14:37 +0000)]
add missing []
Ian Jackson [Mon, 12 Mar 2012 14:37:37 +0000 (14:37 +0000)]
improve proof of create base inclusion
Ian Jackson [Mon, 12 Mar 2012 14:29:08 +0000 (14:29 +0000)]
create tip wip
Ian Jackson [Mon, 12 Mar 2012 14:28:13 +0000 (14:28 +0000)]
introduce macros \pq \pqy \pqn
Ian Jackson [Mon, 12 Mar 2012 14:18:49 +0000 (14:18 +0000)]
create base rename cond to create acyclic
Ian Jackson [Mon, 12 Mar 2012 14:17:50 +0000 (14:17 +0000)]
create base fix base acyclic and condition
Ian Jackson [Mon, 12 Mar 2012 14:13:49 +0000 (14:13 +0000)]
wip create tip
Ian Jackson [Mon, 12 Mar 2012 14:13:20 +0000 (14:13 +0000)]
todo list item
Ian Jackson [Mon, 12 Mar 2012 14:12:52 +0000 (14:12 +0000)]
use Q not B as patch name in create base
Ian Jackson [Mon, 12 Mar 2012 13:57:55 +0000 (13:57 +0000)]
rename Ingredients Prohibit Replay to Prevent
Ian Jackson [Mon, 12 Mar 2012 13:57:35 +0000 (13:57 +0000)]
replace various no replay with Ingredients Prohibit Replay
Ian Jackson [Mon, 12 Mar 2012 13:56:55 +0000 (13:56 +0000)]
rename merge Ordering of L... to Ordering of Ingredients
Ian Jackson [Mon, 12 Mar 2012 13:40:27 +0000 (13:40 +0000)]
create base foreign contents
Ian Jackson [Mon, 12 Mar 2012 13:40:19 +0000 (13:40 +0000)]
change Not Applicable [] to Not Applicable
Ian Jackson [Mon, 12 Mar 2012 13:39:14 +0000 (13:39 +0000)]
create base foreign inclusion
Ian Jackson [Mon, 12 Mar 2012 08:55:53 +0000 (08:55 +0000)]
wip create base
Ian Jackson [Sun, 11 Mar 2012 17:56:49 +0000 (17:56 +0000)]
create base coherence fix title
Ian Jackson [Sun, 11 Mar 2012 17:56:28 +0000 (17:56 +0000)]
create base fix def
Ian Jackson [Sun, 11 Mar 2012 17:43:32 +0000 (17:43 +0000)]
prove and use totally foreign contents
Ian Jackson [Sun, 11 Mar 2012 17:36:15 +0000 (17:36 +0000)]
fix some headings
Ian Jackson [Sun, 11 Mar 2012 17:35:27 +0000 (17:35 +0000)]
formalise foreign merges
Ian Jackson [Sun, 11 Mar 2012 17:35:13 +0000 (17:35 +0000)]
Foreign Contents section in a couple of places
Ian Jackson [Sun, 11 Mar 2012 17:34:15 +0000 (17:34 +0000)]
new foreign contents restriction
Ian Jackson [Sun, 11 Mar 2012 16:31:18 +0000 (16:31 +0000)]
fix a section => subsection
Ian Jackson [Sun, 11 Mar 2012 16:31:09 +0000 (16:31 +0000)]
fix create tip tbd
Ian Jackson [Sun, 11 Mar 2012 16:30:59 +0000 (16:30 +0000)]
wip create base
Ian Jackson [Sun, 11 Mar 2012 16:09:36 +0000 (16:09 +0000)]
merge conditions into conditions
Ian Jackson [Sun, 11 Mar 2012 16:09:27 +0000 (16:09 +0000)]
anticommit clarify note re ingredient order
Ian Jackson [Sun, 11 Mar 2012 16:09:14 +0000 (16:09 +0000)]
anticommit conditions into conditions
Ian Jackson [Sun, 11 Mar 2012 15:57:25 +0000 (15:57 +0000)]
wip creates
Ian Jackson [Sun, 11 Mar 2012 15:56:43 +0000 (15:56 +0000)]
formatting move/add some qeds