equal
deleted
inserted
replaced
19 ./isabelle/bin/isabelle components -a |
19 ./isabelle/bin/isabelle components -a |
20 |
20 |
21 ./isabelle/bin/isabelle build -b HOL |
21 ./isabelle/bin/isabelle build -b HOL |
22 |
22 |
23 ./isabelle/bin/isabelle jedit |
23 ./isabelle/bin/isabelle jedit |
|
24 |
|
25 4. For later update replace "hg clone ..." above by: |
|
26 |
|
27 cd isabelle |
|
28 |
|
29 hg pull -u |
24 |
30 |
25 |
31 |
26 Introduction |
32 Introduction |
27 ------------ |
33 ------------ |
28 |
34 |
187 * Accumulate private commits for a maximum of 1-3 days. |
193 * Accumulate private commits for a maximum of 1-3 days. |
188 |
194 |
189 * Start publishing again by pull or fetch, which normally produces |
195 * Start publishing again by pull or fetch, which normally produces |
190 local merges. |
196 local merges. |
191 |
197 |
192 * Test the merged result as usual and push back in real time. |
198 * Test the merged result, e.g. like this: |
|
199 |
|
200 isabelle build -a |
|
201 |
|
202 * Push back in real time. |
193 |
203 |
194 Piling private changes and public merges longer than 0.5-2 hours is |
204 Piling private changes and public merges longer than 0.5-2 hours is |
195 apt to produce some mess when pushing eventually! |
205 apt to produce some mess when pushing eventually! |
|
206 |
|
207 The pull-test-push cycle should not be repeated too fast, to avoid |
|
208 delaying others from doing the same concurrently. |
196 |
209 |
197 |
210 |
198 Content discipline |
211 Content discipline |
199 ------------------ |
212 ------------------ |
200 |
213 |