Run of fresh-snapshots for context

Try this locally (using silver-platter):

debian-svp new-upstream --snapshot context 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
Opening branch at https://github.com/debian-tex/context.git
Using cached branch file:///home/janitor/debian-janitor/vcs/git/context/,branch=master
/home/janitor/debian-janitor/dulwich/dulwich/repo.py:450: UserWarning: ref refs/tags/upstream/2020.03.10.20200331 points at non-present sha 5e065431ba90cdf0df8f0f865a5dc72546b874ac
  warnings.warn(
upstream/2020.03.10.20200331 does not point to a valid object
upstream/2020.03.10.20200331 does not point to a valid object
upstream/2020.03.10.20200331 does not point to a valid object
Total 12 (delta 8), reused 7 (delta 4), pack-reused 0
All changes applied successfully.
Using upstream branch https://bitbucket.org/phg/context-mirror.git,branch=beta (from configuration)
Total 80360 (delta 58959), reused 65991 (delta 49064)
Using version string 2020.03.10.20200331+git20200705.f6e05e8.
Looking for upstream context/2020.03.10.20200331+git20200705.f6e05e8 in upstream branch <breezy.plugins.debian.upstream.branch.MinimalMemoryBranch object at 0x7fc22f143310>.
Running dist command: /home/janitor/debian-janitor/janitor/../dist.py
Exporting upstream branch revision b'git-v1:f6e05e8759bcf6db94d40b9d9ee0beb268f0347c' to create the tarball
Searching for revision importing context version 2020.03.10.20200331 on branch upstream, main branch, tag debian/2020.03.10.20200331-1.
Upstream import of 2020.03.10.20200331 lacks a tag. Set one by running: brz tag -rrevid:git-v1:9e6b3ed8fb2b0ac20d28e2757675e0101183e696 upstream/2020.03.10.20200331
upstream/2020.03.10.20200331 does not point to a valid object
Total 80360 (delta 58958), reused 65991 (delta 49064)
Conflict adding file bibtex.  Moved existing file to bibtex.moved.
Conflict adding files to bibtex.moved.  Created directory.
Conflict because bibtex.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file bibtex.moved/bst.  Moved existing file to bibtex.moved/bst.moved.
Conflict adding files to bibtex.moved/bst.moved.  Created directory.
Conflict because bibtex.moved/bst.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file bibtex.moved/bst.moved/context.  Moved existing file to bibtex.moved/bst.moved/context.moved.
Conflict adding files to bibtex.moved/bst.moved/context.moved.  Created directory.
Conflict because bibtex.moved/bst.moved/context.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file bibtex.moved/bst.moved/context.moved/mkii.  Moved existing file to bibtex.moved/bst.moved/context.moved/mkii.moved.
Conflict adding files to bibtex.moved/bst.moved/context.moved/mkii.moved.  Created directory.
Conflict because bibtex.moved/bst.moved/context.moved/mkii.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file colors/icc/context.  Moved existing file to colors/icc/context.moved.
Conflict adding files to colors/icc/context.moved.  Created directory.
Conflict because colors/icc/context.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file context/data/scite/context/documents.  Moved existing file to context/data/scite/context/documents.moved.
Conflict adding files to context/data/scite/context/documents.moved.  Created directory.
Conflict because context/data/scite/context/documents.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file context/data/scite/context/lexers/themes.  Moved existing file to context/data/scite/context/lexers/themes.moved.
Conflict adding files to context/data/scite/context/lexers/themes.moved.  Created directory.
Conflict because context/data/scite/context/lexers/themes.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file context/data/texfont.  Moved existing file to context/data/texfont.moved.
Conflict adding files to context/data/texfont.moved.  Created directory.
Conflict because context/data/texfont.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file context/data/textadept/context/lexers.  Moved existing file to context/data/textadept/context/lexers.moved.
Conflict adding files to context/data/textadept/context/lexers.moved.  Created directory.
Conflict because context/data/textadept/context/lexers.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file context/data/textadept/context/modules.  Moved existing file to context/data/textadept/context/modules.moved.
Conflict adding files to context/data/textadept/context/modules.moved.  Created directory.
Conflict because context/data/textadept/context/modules.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file context/data/textadept/context/themes.  Moved existing file to context/data/textadept/context/themes.moved.
Conflict adding files to context/data/textadept/context/themes.moved.  Created directory.
Conflict because context/data/textadept/context/themes.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file context/data/texworks.  Moved existing file to context/data/texworks.moved.
Conflict adding files to context/data/texworks.moved.  Created directory.
Conflict because context/data/texworks.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file context/data/texworks.moved/TUG.  Moved existing file to context/data/texworks.moved/TUG.moved.
Conflict adding files to context/data/texworks.moved/TUG.moved.  Created directory.
Conflict because context/data/texworks.moved/TUG.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file context/data/texworks.moved/completion.  Moved existing file to context/data/texworks.moved/completion.moved.
Conflict adding files to context/data/texworks.moved/completion.moved.  Created directory.
Conflict because context/data/texworks.moved/completion.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file context/data/texworks.moved/configuration.  Moved existing file to context/data/texworks.moved/configuration.moved.
Conflict adding files to context/data/texworks.moved/configuration.moved.  Created directory.
Conflict because context/data/texworks.moved/configuration.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file context/data/vscode/extensions/context/keybindings.  Moved existing file to context/data/vscode/extensions/context/keybindings.moved.
Conflict adding files to context/data/vscode/extensions/context/keybindings.moved.  Created directory.
Conflict because context/data/vscode/extensions/context/keybindings.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file context/data/vscode/extensions/context/settings.  Moved existing file to context/data/vscode/extensions/context/settings.moved.
Conflict adding files to context/data/vscode/extensions/context/settings.moved.  Created directory.
Conflict because context/data/vscode/extensions/context/settings.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file context/data/vscode/extensions/context/tasks.  Moved existing file to context/data/vscode/extensions/context/tasks.moved.
Conflict adding files to context/data/vscode/extensions/context/tasks.moved.  Created directory.
Conflict because context/data/vscode/extensions/context/tasks.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file context/data/vscode/extensions/context/themes.  Moved existing file to context/data/vscode/extensions/context/themes.moved.
Conflict adding files to context/data/vscode/extensions/context/themes.moved.  Created directory.
Conflict because context/data/vscode/extensions/context/themes.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/documents/general/leaflets.  Moved existing file to doc/context/documents/general/leaflets.moved.
Conflict adding files to doc/context/documents/general/leaflets.moved.  Created directory.
Conflict because doc/context/documents/general/leaflets.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/documents/general/magazines.  Moved existing file to doc/context/documents/general/magazines.moved.
Conflict adding files to doc/context/documents/general/magazines.moved.  Created directory.
Conflict because doc/context/documents/general/magazines.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/examples.  Moved existing file to doc/context/examples.moved.
Conflict adding files to doc/context/examples.moved.  Created directory.
Conflict because doc/context/examples.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/examples.moved/calculator.  Moved existing file to doc/context/examples.moved/calculator.moved.
Conflict adding files to doc/context/examples.moved/calculator.moved.  Created directory.
Conflict because doc/context/examples.moved/calculator.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/examples.moved/clock.  Moved existing file to doc/context/examples.moved/clock.moved.
Conflict adding files to doc/context/examples.moved/clock.moved.  Created directory.
Conflict because doc/context/examples.moved/clock.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.  Moved existing file to doc/context/presentations.moved.
Conflict adding files to doc/context/presentations.moved.  Created directory.
Conflict because doc/context/presentations.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/bachotex.  Moved existing file to doc/context/presentations.moved/bachotex.moved.
Conflict adding files to doc/context/presentations.moved/bachotex.moved.  Created directory.
Conflict because doc/context/presentations.moved/bachotex.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/bachotex.moved/2005.  Moved existing file to doc/context/presentations.moved/bachotex.moved/2005.moved.
Conflict adding files to doc/context/presentations.moved/bachotex.moved/2005.moved.  Created directory.
Conflict because doc/context/presentations.moved/bachotex.moved/2005.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/bachotex.moved/2009.  Moved existing file to doc/context/presentations.moved/bachotex.moved/2009.moved.
Conflict adding files to doc/context/presentations.moved/bachotex.moved/2009.moved.  Created directory.
Conflict because doc/context/presentations.moved/bachotex.moved/2009.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/bachotex.moved/2010.  Moved existing file to doc/context/presentations.moved/bachotex.moved/2010.moved.
Conflict adding files to doc/context/presentations.moved/bachotex.moved/2010.moved.  Created directory.
Conflict because doc/context/presentations.moved/bachotex.moved/2010.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/bachotex.moved/2011.  Moved existing file to doc/context/presentations.moved/bachotex.moved/2011.moved.
Conflict adding files to doc/context/presentations.moved/bachotex.moved/2011.moved.  Created directory.
Conflict because doc/context/presentations.moved/bachotex.moved/2011.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/bachotex.moved/2012.  Moved existing file to doc/context/presentations.moved/bachotex.moved/2012.moved.
Conflict adding files to doc/context/presentations.moved/bachotex.moved/2012.moved.  Created directory.
Conflict because doc/context/presentations.moved/bachotex.moved/2012.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/bachotex.moved/2013.  Moved existing file to doc/context/presentations.moved/bachotex.moved/2013.moved.
Conflict adding files to doc/context/presentations.moved/bachotex.moved/2013.moved.  Created directory.
Conflict because doc/context/presentations.moved/bachotex.moved/2013.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/bachotex.moved/2014.  Moved existing file to doc/context/presentations.moved/bachotex.moved/2014.moved.
Conflict adding files to doc/context/presentations.moved/bachotex.moved/2014.moved.  Created directory.
Conflict because doc/context/presentations.moved/bachotex.moved/2014.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/bachotex.moved/2015.  Moved existing file to doc/context/presentations.moved/bachotex.moved/2015.moved.
Conflict adding files to doc/context/presentations.moved/bachotex.moved/2015.moved.  Created directory.
Conflict because doc/context/presentations.moved/bachotex.moved/2015.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/bachotex.moved/2016.  Moved existing file to doc/context/presentations.moved/bachotex.moved/2016.moved.
Conflict adding files to doc/context/presentations.moved/bachotex.moved/2016.moved.  Created directory.
Conflict because doc/context/presentations.moved/bachotex.moved/2016.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/bachotex.moved/2017.  Moved existing file to doc/context/presentations.moved/bachotex.moved/2017.moved.
Conflict adding files to doc/context/presentations.moved/bachotex.moved/2017.moved.  Created directory.
Conflict because doc/context/presentations.moved/bachotex.moved/2017.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/bachotex.moved/2018.  Moved existing file to doc/context/presentations.moved/bachotex.moved/2018.moved.
Conflict adding files to doc/context/presentations.moved/bachotex.moved/2018.moved.  Created directory.
Conflict because doc/context/presentations.moved/bachotex.moved/2018.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/bachotex.moved/2019.  Moved existing file to doc/context/presentations.moved/bachotex.moved/2019.moved.
Conflict adding files to doc/context/presentations.moved/bachotex.moved/2019.moved.  Created directory.
Conflict because doc/context/presentations.moved/bachotex.moved/2019.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/context.  Moved existing file to doc/context/presentations.moved/context.moved.
Conflict adding files to doc/context/presentations.moved/context.moved.  Created directory.
Conflict because doc/context/presentations.moved/context.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/context.moved/2007.  Moved existing file to doc/context/presentations.moved/context.moved/2007.moved.
Conflict adding files to doc/context/presentations.moved/context.moved/2007.moved.  Created directory.
Conflict because doc/context/presentations.moved/context.moved/2007.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/context.moved/2010.  Moved existing file to doc/context/presentations.moved/context.moved/2010.moved.
Conflict adding files to doc/context/presentations.moved/context.moved/2010.moved.  Created directory.
Conflict because doc/context/presentations.moved/context.moved/2010.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/context.moved/2011.  Moved existing file to doc/context/presentations.moved/context.moved/2011.moved.
Conflict adding files to doc/context/presentations.moved/context.moved/2011.moved.  Created directory.
Conflict because doc/context/presentations.moved/context.moved/2011.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/context.moved/2012.  Moved existing file to doc/context/presentations.moved/context.moved/2012.moved.
Conflict adding files to doc/context/presentations.moved/context.moved/2012.moved.  Created directory.
Conflict because doc/context/presentations.moved/context.moved/2012.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/context.moved/2013.  Moved existing file to doc/context/presentations.moved/context.moved/2013.moved.
Conflict adding files to doc/context/presentations.moved/context.moved/2013.moved.  Created directory.
Conflict because doc/context/presentations.moved/context.moved/2013.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/context.moved/2015.  Moved existing file to doc/context/presentations.moved/context.moved/2015.moved.
Conflict adding files to doc/context/presentations.moved/context.moved/2015.moved.  Created directory.
Conflict because doc/context/presentations.moved/context.moved/2015.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/context.moved/2016.  Moved existing file to doc/context/presentations.moved/context.moved/2016.moved.
Conflict adding files to doc/context/presentations.moved/context.moved/2016.moved.  Created directory.
Conflict because doc/context/presentations.moved/context.moved/2016.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/context.moved/2017.  Moved existing file to doc/context/presentations.moved/context.moved/2017.moved.
Conflict adding files to doc/context/presentations.moved/context.moved/2017.moved.  Created directory.
Conflict because doc/context/presentations.moved/context.moved/2017.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/context.moved/2019.  Moved existing file to doc/context/presentations.moved/context.moved/2019.moved.
Conflict adding files to doc/context/presentations.moved/context.moved/2019.moved.  Created directory.
Conflict because doc/context/presentations.moved/context.moved/2019.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/examples.  Moved existing file to doc/context/presentations.moved/examples.moved.
Conflict adding files to doc/context/presentations.moved/examples.moved.  Created directory.
Conflict because doc/context/presentations.moved/examples.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/tug.  Moved existing file to doc/context/presentations.moved/tug.moved.
Conflict adding files to doc/context/presentations.moved/tug.moved.  Created directory.
Conflict because doc/context/presentations.moved/tug.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/tug.moved/2001.  Moved existing file to doc/context/presentations.moved/tug.moved/2001.moved.
Conflict adding files to doc/context/presentations.moved/tug.moved/2001.moved.  Created directory.
Conflict because doc/context/presentations.moved/tug.moved/2001.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/presentations.moved/tug.moved/2007.  Moved existing file to doc/context/presentations.moved/tug.moved/2007.moved.
Conflict adding files to doc/context/presentations.moved/tug.moved/2007.moved.  Created directory.
Conflict because doc/context/presentations.moved/tug.moved/2007.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/leaflets.  Moved existing file to doc/context/sources/general/leaflets.moved.
Conflict adding files to doc/context/sources/general/leaflets.moved.  Created directory.
Conflict because doc/context/sources/general/leaflets.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/magazines.  Moved existing file to doc/context/sources/general/magazines.moved.
Conflict adding files to doc/context/sources/general/magazines.moved.  Created directory.
Conflict because doc/context/sources/general/magazines.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/about.  Moved existing file to doc/context/sources/general/manuals/about.moved.
Conflict adding files to doc/context/sources/general/manuals/about.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/about.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/bidi.  Moved existing file to doc/context/sources/general/manuals/bidi.moved.
Conflict adding files to doc/context/sources/general/manuals/bidi.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/bidi.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/charts.  Moved existing file to doc/context/sources/general/manuals/charts.moved.
Conflict adding files to doc/context/sources/general/manuals/charts.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/charts.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/colors.  Moved existing file to doc/context/sources/general/manuals/colors.moved.
Conflict adding files to doc/context/sources/general/manuals/colors.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/colors.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/columnsets.  Moved existing file to doc/context/sources/general/manuals/columnsets.moved.
Conflict adding files to doc/context/sources/general/manuals/columnsets.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/columnsets.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/details.  Moved existing file to doc/context/sources/general/manuals/details.moved.
Conflict adding files to doc/context/sources/general/manuals/details.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/details.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/epub.  Moved existing file to doc/context/sources/general/manuals/epub.moved.
Conflict adding files to doc/context/sources/general/manuals/epub.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/epub.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/followingup.  Moved existing file to doc/context/sources/general/manuals/followingup.moved.
Conflict adding files to doc/context/sources/general/manuals/followingup.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/followingup.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/fonts.  Moved existing file to doc/context/sources/general/manuals/fonts.moved.
Conflict adding files to doc/context/sources/general/manuals/fonts.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/fonts.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/graphics.  Moved existing file to doc/context/sources/general/manuals/graphics.moved.
Conflict adding files to doc/context/sources/general/manuals/graphics.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/graphics.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/hybrid.  Moved existing file to doc/context/sources/general/manuals/hybrid.moved.
Conflict adding files to doc/context/sources/general/manuals/hybrid.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/hybrid.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/interaction.  Moved existing file to doc/context/sources/general/manuals/interaction.moved.
Conflict adding files to doc/context/sources/general/manuals/interaction.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/interaction.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/languages.  Moved existing file to doc/context/sources/general/manuals/languages.moved.
Conflict adding files to doc/context/sources/general/manuals/languages.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/languages.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/libraries.  Moved existing file to doc/context/sources/general/manuals/libraries.moved.
Conflict adding files to doc/context/sources/general/manuals/libraries.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/libraries.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/lowlevel.  Moved existing file to doc/context/sources/general/manuals/lowlevel.moved.
Conflict adding files to doc/context/sources/general/manuals/lowlevel.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/lowlevel.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/lua.  Moved existing file to doc/context/sources/general/manuals/lua.moved.
Conflict adding files to doc/context/sources/general/manuals/lua.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/lua.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/math.  Moved existing file to doc/context/sources/general/manuals/math.moved.
Conflict adding files to doc/context/sources/general/manuals/math.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/math.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/mathml.  Moved existing file to doc/context/sources/general/manuals/mathml.moved.
Conflict adding files to doc/context/sources/general/manuals/mathml.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/mathml.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/metafun.  Moved existing file to doc/context/sources/general/manuals/metafun.moved.
Conflict adding files to doc/context/sources/general/manuals/metafun.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/metafun.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/mk.  Moved existing file to doc/context/sources/general/manuals/mk.moved.
Conflict adding files to doc/context/sources/general/manuals/mk.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/mk.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/musings.  Moved existing file to doc/context/sources/general/manuals/musings.moved.
Conflict adding files to doc/context/sources/general/manuals/musings.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/musings.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/nodes.  Moved existing file to doc/context/sources/general/manuals/nodes.moved.
Conflict adding files to doc/context/sources/general/manuals/nodes.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/nodes.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/notnow.  Moved existing file to doc/context/sources/general/manuals/notnow.moved.
Conflict adding files to doc/context/sources/general/manuals/notnow.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/notnow.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/onandon.  Moved existing file to doc/context/sources/general/manuals/onandon.moved.
Conflict adding files to doc/context/sources/general/manuals/onandon.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/onandon.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/pagecolumns.  Moved existing file to doc/context/sources/general/manuals/pagecolumns.moved.
Conflict adding files to doc/context/sources/general/manuals/pagecolumns.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/pagecolumns.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/publications.  Moved existing file to doc/context/sources/general/manuals/publications.moved.
Conflict adding files to doc/context/sources/general/manuals/publications.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/publications.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/readme.  Moved existing file to doc/context/sources/general/manuals/readme.moved.
Conflict adding files to doc/context/sources/general/manuals/readme.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/readme.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/rules.  Moved existing file to doc/context/sources/general/manuals/rules.moved.
Conflict adding files to doc/context/sources/general/manuals/rules.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/rules.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/spacing.  Moved existing file to doc/context/sources/general/manuals/spacing.moved.
Conflict adding files to doc/context/sources/general/manuals/spacing.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/spacing.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/spreadsheets.  Moved existing file to doc/context/sources/general/manuals/spreadsheets.moved.
Conflict adding files to doc/context/sources/general/manuals/spreadsheets.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/spreadsheets.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/sql.  Moved existing file to doc/context/sources/general/manuals/sql.moved.
Conflict adding files to doc/context/sources/general/manuals/sql.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/sql.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/start.  Moved existing file to doc/context/sources/general/manuals/start.moved.
Conflict adding files to doc/context/sources/general/manuals/start.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/start.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/start.moved/en.  Moved existing file to doc/context/sources/general/manuals/start.moved/en.moved.
Conflict adding files to doc/context/sources/general/manuals/start.moved/en.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/start.moved/en.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/start.moved/graphics.  Moved existing file to doc/context/sources/general/manuals/start.moved/graphics.moved.
Conflict adding files to doc/context/sources/general/manuals/start.moved/graphics.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/start.moved/graphics.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/steps.  Moved existing file to doc/context/sources/general/manuals/steps.moved.
Conflict adding files to doc/context/sources/general/manuals/steps.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/steps.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/still.  Moved existing file to doc/context/sources/general/manuals/still.moved.
Conflict adding files to doc/context/sources/general/manuals/still.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/still.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/svg.  Moved existing file to doc/context/sources/general/manuals/svg.moved.
Conflict adding files to doc/context/sources/general/manuals/svg.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/svg.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/swiglib.  Moved existing file to doc/context/sources/general/manuals/swiglib.moved.
Conflict adding files to doc/context/sources/general/manuals/swiglib.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/swiglib.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/templates.  Moved existing file to doc/context/sources/general/manuals/templates.moved.
Conflict adding files to doc/context/sources/general/manuals/templates.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/templates.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/texit.  Moved existing file to doc/context/sources/general/manuals/texit.moved.
Conflict adding files to doc/context/sources/general/manuals/texit.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/texit.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/tiptrick.  Moved existing file to doc/context/sources/general/manuals/tiptrick.moved.
Conflict adding files to doc/context/sources/general/manuals/tiptrick.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/tiptrick.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/tools.  Moved existing file to doc/context/sources/general/manuals/tools.moved.
Conflict adding files to doc/context/sources/general/manuals/tools.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/tools.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file doc/context/sources/general/manuals/xtables.  Moved existing file to doc/context/sources/general/manuals/xtables.moved.
Conflict adding files to doc/context/sources/general/manuals/xtables.moved.  Created directory.
Conflict because doc/context/sources/general/manuals/xtables.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file fonts/afm/hoekwater/context.  Moved existing file to fonts/afm/hoekwater/context.moved.
Conflict adding files to fonts/afm/hoekwater/context.moved.  Created directory.
Conflict because fonts/afm/hoekwater/context.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file fonts/cid.  Moved existing file to fonts/cid.moved.
Conflict adding files to fonts/cid.moved.  Created directory.
Conflict because fonts/cid.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file fonts/cid.moved/fontforge.  Moved existing file to fonts/cid.moved/fontforge.moved.
Conflict adding files to fonts/cid.moved/fontforge.moved.  Created directory.
Conflict because fonts/cid.moved/fontforge.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file fonts/enc/dvips/context.  Moved existing file to fonts/enc/dvips/context.moved.
Conflict adding files to fonts/enc/dvips/context.moved.  Created directory.
Conflict because fonts/enc/dvips/context.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file fonts/map/dvips/context.  Moved existing file to fonts/map/dvips/context.moved.
Conflict adding files to fonts/map/dvips/context.moved.  Created directory.
Conflict because fonts/map/dvips/context.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file fonts/map/luatex.  Moved existing file to fonts/map/luatex.moved.
Conflict adding files to fonts/map/luatex.moved.  Created directory.
Conflict because fonts/map/luatex.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file fonts/map/luatex.moved/context.  Moved existing file to fonts/map/luatex.moved/context.moved.
Conflict adding files to fonts/map/luatex.moved/context.moved.  Created directory.
Conflict because fonts/map/luatex.moved/context.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file fonts/misc.  Moved existing file to fonts/misc.moved.
Conflict adding files to fonts/misc.moved.  Created directory.
Conflict because fonts/misc.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file fonts/misc.moved/xetex.  Moved existing file to fonts/misc.moved/xetex.moved.
Conflict adding files to fonts/misc.moved/xetex.moved.  Created directory.
Conflict because fonts/misc.moved/xetex.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file fonts/misc.moved/xetex.moved/fontmapping.  Moved existing file to fonts/misc.moved/xetex.moved/fontmapping.moved.
Conflict adding files to fonts/misc.moved/xetex.moved/fontmapping.moved.  Created directory.
Conflict because fonts/misc.moved/xetex.moved/fontmapping.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file fonts/misc.moved/xetex.moved/fontmapping.moved/context.  Moved existing file to fonts/misc.moved/xetex.moved/fontmapping.moved/context.moved.
Conflict adding files to fonts/misc.moved/xetex.moved/fontmapping.moved/context.moved.  Created directory.
Conflict because fonts/misc.moved/xetex.moved/fontmapping.moved/context.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file fonts/tfm/hoekwater/context.  Moved existing file to fonts/tfm/hoekwater/context.moved.
Conflict adding files to fonts/tfm/hoekwater/context.moved.  Created directory.
Conflict because fonts/tfm/hoekwater/context.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file metapost/context/base/common.  Moved existing file to metapost/context/base/common.moved.
Conflict adding files to metapost/context/base/common.moved.  Created directory.
Conflict because metapost/context/base/common.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file metapost/context/base/mpii.  Moved existing file to metapost/context/base/mpii.moved.
Conflict adding files to metapost/context/base/mpii.moved.  Created directory.
Conflict because metapost/context/base/mpii.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file metapost/context/fonts.  Moved existing file to metapost/context/fonts.moved.
Conflict adding files to metapost/context/fonts.moved.  Created directory.
Conflict because metapost/context/fonts.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file metapost/context/fonts.moved/mpiv.  Moved existing file to metapost/context/fonts.moved/mpiv.moved.
Conflict adding files to metapost/context/fonts.moved/mpiv.moved.  Created directory.
Conflict because metapost/context/fonts.moved/mpiv.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file scripts/context/ruby/base.  Moved existing file to scripts/context/ruby/base.moved.
Conflict adding files to scripts/context/ruby/base.moved.  Created directory.
Conflict because scripts/context/ruby/base.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file scripts/context/ruby/base.moved/kpse.  Moved existing file to scripts/context/ruby/base.moved/kpse.moved.
Conflict adding files to scripts/context/ruby/base.moved/kpse.moved.  Created directory.
Conflict because scripts/context/ruby/base.moved/kpse.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file scripts/context/ruby/rslb.  Moved existing file to scripts/context/ruby/rslb.moved.
Conflict adding files to scripts/context/ruby/rslb.moved.  Created directory.
Conflict because scripts/context/ruby/rslb.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file scripts/context/stubs/source.  Moved existing file to scripts/context/stubs/source.moved.
Conflict adding files to scripts/context/stubs/source.moved.  Created directory.
Conflict because scripts/context/stubs/source.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file tex/context/bib.  Moved existing file to tex/context/bib.moved.
Conflict adding files to tex/context/bib.moved.  Created directory.
Conflict because tex/context/bib.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file tex/context/bib.moved/common.  Moved existing file to tex/context/bib.moved/common.moved.
Conflict adding files to tex/context/bib.moved/common.moved.  Created directory.
Conflict because tex/context/bib.moved/common.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file tex/context/bib.moved/mkii.  Moved existing file to tex/context/bib.moved/mkii.moved.
Conflict adding files to tex/context/bib.moved/mkii.moved.  Created directory.
Conflict because tex/context/bib.moved/mkii.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file tex/context/fonts/mkii.  Moved existing file to tex/context/fonts/mkii.moved.
Conflict adding files to tex/context/fonts/mkii.moved.  Created directory.
Conflict because tex/context/fonts/mkii.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file tex/context/modules/common.  Moved existing file to tex/context/modules/common.moved.
Conflict adding files to tex/context/modules/common.moved.  Created directory.
Conflict because tex/context/modules/common.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file tex/context/modules/mkii.  Moved existing file to tex/context/modules/mkii.moved.
Conflict adding files to tex/context/modules/mkii.moved.  Created directory.
Conflict because tex/context/modules/mkii.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file tex/context/patterns.  Moved existing file to tex/context/patterns.moved.
Conflict adding files to tex/context/patterns.moved.  Created directory.
Conflict because tex/context/patterns.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file tex/context/patterns.moved/common.  Moved existing file to tex/context/patterns.moved/common.moved.
Conflict adding files to tex/context/patterns.moved/common.moved.  Created directory.
Conflict because tex/context/patterns.moved/common.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file tex/context/patterns.moved/mkii.  Moved existing file to tex/context/patterns.moved/mkii.moved.
Conflict adding files to tex/context/patterns.moved/mkii.moved.  Created directory.
Conflict because tex/context/patterns.moved/mkii.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file tex/context/patterns.moved/mkiv.  Moved existing file to tex/context/patterns.moved/mkiv.moved.
Conflict adding files to tex/context/patterns.moved/mkiv.moved.  Created directory.
Conflict because tex/context/patterns.moved/mkiv.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file tex/context/sample/third.  Moved existing file to tex/context/sample/third.moved.
Conflict adding files to tex/context/sample/third.moved.  Created directory.
Conflict because tex/context/sample/third.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file tex/context/test.  Moved existing file to tex/context/test.moved.
Conflict adding files to tex/context/test.moved.  Created directory.
Conflict because tex/context/test.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file tex/context/test.moved/mkiv.  Moved existing file to tex/context/test.moved/mkiv.moved.
Conflict adding files to tex/context/test.moved/mkiv.moved.  Created directory.
Conflict because tex/context/test.moved/mkiv.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file tex/context/user.  Moved existing file to tex/context/user.moved.
Conflict adding files to tex/context/user.moved.  Created directory.
Conflict because tex/context/user.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file tex/context/user.moved/mkii.  Moved existing file to tex/context/user.moved/mkii.moved.
Conflict adding files to tex/context/user.moved/mkii.moved.  Created directory.
Conflict because tex/context/user.moved/mkii.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file tex/generic/context/ppchtex.  Moved existing file to tex/generic/context/ppchtex.moved.
Conflict adding files to tex/generic/context/ppchtex.moved.  Created directory.
Conflict because tex/generic/context/ppchtex.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file tex/latex.  Moved existing file to tex/latex.moved.
Conflict adding files to tex/latex.moved.  Created directory.
Conflict because tex/latex.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file tex/latex.moved/context.  Moved existing file to tex/latex.moved/context.moved.
Conflict adding files to tex/latex.moved/context.moved.  Created directory.
Conflict because tex/latex.moved/context.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file tex/latex.moved/context.moved/ppchtex.  Moved existing file to tex/latex.moved/context.moved/ppchtex.moved.
Conflict adding files to tex/latex.moved/context.moved/ppchtex.moved.  Created directory.
Conflict because tex/latex.moved/context.moved/ppchtex.moved is not versioned, but has versioned children.  Versioned directory.
408 conflicts encountered.
Worker failed (upstream-merged-conflicts): Upstream version 2020.03.10.20200331+git20200705.f6e05e8 conflicted.
Elapsed time: 1:15:09.596849

Summary

Upstream version: 2020.03.10.20200331+git20200705.f6e05e8.

Full worker log