Run of fresh-releases for derby

Try this locally (using silver-platter):

debian-svp new-upstream derby 
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
Opening branch at https://salsa.debian.org/java-team/derby.git/
Using cached branch https://janitor.debian.net/git/derby/
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
/srv/janitor/debian-janitor/python-debian/lib/debian/copyright.py:654: UserWarning: Fixing Format URL
  warnings.warn('Fixing Format URL')
http://db.apache.org/derby/ is permanently redirected to http://db.apache.org/derby/
http://db.apache.org/derby/ is permanently redirected to http://db.apache.org/derby/
http://db.apache.org/derby/ is permanently redirected to http://db.apache.org/derby/
http://db.apache.org/derby/ is permanently redirected to http://db.apache.org/derby/
http://db.apache.org/derby/ is permanently redirected to http://db.apache.org/derby/
http://db.apache.org/derby/ is permanently redirected to http://db.apache.org/derby/
http://db.apache.org/derby/ is permanently redirected to http://db.apache.org/derby/
http://db.apache.org/derby/ is permanently redirected to http://db.apache.org/derby/
Using version string 10.15.2.0.
/srv/janitor/debian-janitor/python-debian/lib/debian/copyright.py:654: UserWarning: Fixing Format URL
  warnings.warn('Fixing Format URL')
Using uscan to look for the upstream tarball.
uscan warn: Possible OpenPGP signature found at:
   http://archive.apache.org/dist/db/derby/db-derby-10.15.2.0/db-derby-10.15.2.0-src.tar.gz.asc
 * Add opts=pgpsigurlmangle=s/$/.asc/ or opts=pgpmode=auto to debian/watch
 * Add debian/upstream/signing-key.asc.
 See uscan(1) for more details
Possible OpenPGP signature found at:
   http://archive.apache.org/dist/db/derby/db-derby-10.15.2.0/db-derby-10.15.2.0-src.tar.gz.asc
 * Add opts=pgpsigurlmangle=s/$/.asc/ or opts=pgpmode=auto to debian/watch
 * Add debian/upstream/signing-key.asc.
 See uscan(1) for more details
Imported derby_10.15.2.0.orig.tar.xz with pristine-tar.
Conflict adding file java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile.  Moved existing file to java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile.moved.
Conflict adding files to java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile.moved.  Created directory.
Conflict because java/org.apache.derby.engine/org/apache/derby/iapi/services/classfile.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.engine/org/apache/derby/iapi/services/memory.  Moved existing file to java/org.apache.derby.engine/org/apache/derby/iapi/services/memory.moved.
Conflict adding files to java/org.apache.derby.engine/org/apache/derby/iapi/services/memory.moved.  Created directory.
Conflict because java/org.apache.derby.engine/org/apache/derby/iapi/services/memory.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.engine/org/apache/derby/iapi/services/timer.  Moved existing file to java/org.apache.derby.engine/org/apache/derby/iapi/services/timer.moved.
Conflict adding files to java/org.apache.derby.engine/org/apache/derby/iapi/services/timer.moved.  Created directory.
Conflict because java/org.apache.derby.engine/org/apache/derby/iapi/services/timer.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.engine/org/apache/derby/impl/services/jmxnone.  Moved existing file to java/org.apache.derby.engine/org/apache/derby/impl/services/jmxnone.moved.
Conflict adding files to java/org.apache.derby.engine/org/apache/derby/impl/services/jmxnone.moved.  Created directory.
Conflict because java/org.apache.derby.engine/org/apache/derby/impl/services/jmxnone.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.engine/org/apache/derby/impl/services/uuid.  Moved existing file to java/org.apache.derby.engine/org/apache/derby/impl/services/uuid.moved.
Conflict adding files to java/org.apache.derby.engine/org/apache/derby/impl/services/uuid.moved.  Created directory.
Conflict because java/org.apache.derby.engine/org/apache/derby/impl/services/uuid.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.engine/org/apache/derby/impl/store/replication/buffer.  Moved existing file to java/org.apache.derby.engine/org/apache/derby/impl/store/replication/buffer.moved.
Conflict adding files to java/org.apache.derby.engine/org/apache/derby/impl/store/replication/buffer.moved.  Created directory.
Conflict because java/org.apache.derby.engine/org/apache/derby/impl/store/replication/buffer.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.optionaltools/org/apache/derby/optional/json.  Moved existing file to java/org.apache.derby.optionaltools/org/apache/derby/optional/json.moved.
Conflict adding files to java/org.apache.derby.optionaltools/org/apache/derby/optional/json.moved.  Created directory.
Conflict because java/org.apache.derby.optionaltools/org/apache/derby/optional/json.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/master/j9_13.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/master/j9_13.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/master/j9_13.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/master/j9_13.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/master/j9_22.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/master/j9_22.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/master/j9_22.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/master/j9_22.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/master/j9_foundation.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/master/j9_foundation.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/master/j9_foundation.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/master/j9_foundation.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/ConnectionMethods.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/ConnectionMethods.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/ConnectionMethods.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/ConnectionMethods.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/Derby6587.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/Derby6587.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/Derby6587.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/Derby6587.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/ImportExport.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/ImportExport.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/ImportExport.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/ImportExport.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/ResultSetStream.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/ResultSetStream.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/ResultSetStream.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/ResultSetStream.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/serializedDataSources.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/serializedDataSources.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/serializedDataSources.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/serializedDataSources.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/v1.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/v1.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/v1.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/v1.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/v2.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/v2.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/v2.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/testData/v2.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/helpers.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/helpers.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/helpers.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/compatibility/helpers.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/data.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/data.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/data.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/i18n/data.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/xmlTestFiles.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/xmlTestFiles.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/xmlTestFiles.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/lang/xmlTestFiles.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/helpers.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/helpers.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/helpers.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/helpers.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/StaticInitializers.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/StaticInitializers.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/StaticInitializers.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/StaticInitializers.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/util/streams.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic.moved/jdbc.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic.moved/jdbc.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic.moved/jdbc.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/perf/basic.moved/jdbc.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/perf/clients.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/schema.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/schema.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/schema.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/schema.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/tasks.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/utils.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/utils.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/utils.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/system/mailjdbc/utils.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/init.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/init.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/init.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/init.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/tester.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/utils.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/utils.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/utils.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/system/nstest/utils.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/client.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/client.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/client.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/client.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/direct.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/direct.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/direct.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/direct.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/load.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/load.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/load.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/load.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/model.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/model.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/model.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/model.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/routines.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/routines.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/routines.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/routines.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/run.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/run.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/run.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/run.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/schema.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/schema.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/schema.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/schema.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/test.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/test.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/test.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/test.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/util.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/util.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/util.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/system/oe/util.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/query.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/query.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/query.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/query.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/utils.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/utils.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/utils.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/system/optimizer/utils.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/tools.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/tools.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/tools.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/tools.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/utils.  Moved existing file to java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/utils.moved.
Conflict adding files to java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/utils.moved.  Created directory.
Conflict because java/org.apache.derby.tests/org/apache/derbyTesting/system/sttest/utils.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook.  Moved existing file to java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook.moved.
Conflict adding files to java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook.moved.  Created directory.
Conflict because java/org.apache.derby.tools/org/apache/derby/impl/tools/dblook.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tools/org/apache/derby/impl/tools/optional.  Moved existing file to java/org.apache.derby.tools/org/apache/derby/impl/tools/optional.moved.
Conflict adding files to java/org.apache.derby.tools/org/apache/derby/impl/tools/optional.moved.  Created directory.
Conflict because java/org.apache.derby.tools/org/apache/derby/impl/tools/optional.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter.  Moved existing file to java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter.moved.
Conflict adding files to java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter.moved.  Created directory.
Conflict because java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter.moved/resources.  Moved existing file to java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter.moved/resources.moved.
Conflict adding files to java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter.moved/resources.moved.  Created directory.
Conflict because java/org.apache.derby.tools/org/apache/derby/impl/tools/planexporter.moved/resources.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/pptesting/org/apache/derby/client.  Moved existing file to java/pptesting/org/apache/derby/client.moved.
Conflict adding files to java/pptesting/org/apache/derby/client.moved.  Created directory.
Conflict because java/pptesting/org/apache/derby/client.moved is not versioned, but has versioned children.  Versioned directory.
Conflict adding file java/pptesting/org/apache/derby/client.moved/am.  Moved existing file to java/pptesting/org/apache/derby/client.moved/am.moved.
Conflict adding files to java/pptesting/org/apache/derby/client.moved/am.moved.  Created directory.
Conflict because java/pptesting/org/apache/derby/client.moved/am.moved is not versioned, but has versioned children.  Versioned directory.
153 conflicts encountered.
Worker failed (upstream-merged-conflicts): Upstream version 10.15.2.0 conflicted.
Elapsed time: 0:49:40.717859

Summary

Upstream version: 10.15.2.0.

Full worker log