Run of fresh-releases for cherrytree

Try this locally package):

debcheckout cherrytree
cd cherrytree
new-upstream --debian-revision=0kali1 --require-uscan --refresh-patches
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
[2021-05-06 20:15:40] Running ['new-upstream', '--debian-revision=0kali1', '--require-uscan', '--refresh-patches']
[2021-05-06 20:15:40] Opening branch at https://gitlab.com/kalilinux/packages/cherrytree.git/,branch=kali%2Fmaster
[2021-05-06 20:15:41] Cached branch URL file:/home/janitor/vcs/git/cherrytree,branch=kali%2Flatest missing: Branch does not exist: Not a branch: "/home/janitor/vcs/git/cherrytree/": location is a repository.
[2021-05-06 20:15:41] 146/538)
[2021-05-06 20:15:41] 38)
[2021-05-06 20:15:41] 38)
[2021-05-06 20:15:41] 38), done.
[2021-05-06 20:15:41] 6% (27/437)
[2021-05-06 20:15:41] % (184/437)
[2021-05-06 20:15:42] Total 1756 (delta 95), reused 512 (delta 88), pack-reused 1218
[2021-05-06 20:15:52] Total 10 (delta 0), reused 10 (delta 0), pack-reused 0
[2021-05-06 20:15:53] Total 30 (delta 4), reused 29 (delta 3), pack-reused 0
[2021-05-06 20:15:53] Workspace ready - starting.
[2021-05-06 20:15:54] Using upstream branch https://github.com/giuspen/cherrytree.git (from configuration)
[2021-05-06 20:15:55] Total 22692 (delta 354), reused 581 (delta 331), pack-reused 22075
[2021-05-06 20:16:26] Using version string 0.99.36.
[2021-05-06 20:16:26] Old upstream version '0.99.9~git20200901' is not present in upstream branch <UpstreamBranchSource for 'https://github.com/giuspen/cherrytree.git/'>. Unable to determine whether upstream history is normally included. Assuming no.
[2021-05-06 20:16:26] Using uscan to look for the upstream tarball.
Use of uninitialized value in concatenation (.) or string at /usr/share/perl5/Devscripts/Uscan/WatchLine.pm line 868.
uupdate: debian/source/format is "3.0 (quilt)".
uupdate: Auto-generating cherrytree_0.99.9~git20200901-0kali1.debian.tar.xz
uupdate: -> Copy to      cherrytree_0.99.36-1.debian.tar.xz
[2021-05-06 20:18:23] Imported cherrytree_0.99.36.orig.tar.gz with pristine-tar.
[2021-05-06 20:20:27] Text conflict in debian/control
[2021-05-06 20:20:27] Text conflict in debian/rules
[2021-05-06 20:20:28] Elapsed time: 0:04:47.404903
Traceback (most recent call last):
  File "/usr/lib/python3.7/runpy.py", line 193, in _run_module_as_main
    "__main__", mod_spec)
  File "/usr/lib/python3.7/runpy.py", line 85, in _run_code
    exec(code, run_globals)
  File "/opt/debian-janitor/janitor/worker.py", line 977, in <module>
    sys.exit(main())
  File "/opt/debian-janitor/janitor/worker.py", line 930, in main
    resume_subworker_result=resume_subworker_result,
  File "/usr/lib/python3.7/contextlib.py", line 112, in __enter__
    return next(self.gen)
  File "/opt/debian-janitor/janitor/worker.py", line 785, in process_package
    committer=committer
  File "/opt/debian-janitor/janitor/worker.py", line 467, in make_changes
    reporter=reporter,
  File "/opt/debian-janitor/janitor/worker.py", line 169, in make_changes
    return super(NewUpstreamChanger, self).make_changes(local_tree, subpath, *args, **kwargs)
  File "/opt/debian-janitor/silver-platter/silver_platter/debian/upstream.py", line 1279, in make_changes
    require_uscan=self.require_uscan,
  File "/opt/debian-janitor/silver-platter/silver_platter/debian/upstream.py", line 967, in merge_upstream
    files_excluded=files_excluded,
  File "/home/janitor/.config/breezy/plugins/debian/merge_upstream.py", line 177, in do_merge
    committer=committer, files_excluded=files_excluded)
  File "/home/janitor/.config/breezy/plugins/debian/import_dsc.py", line 1348, in merge_upstream
    merge_type=merge_type)
  File "/opt/debian-janitor/breezy/breezy/workingtree.py", line 681, in merge_from_branch
    conflicts = merger.do_merge()
  File "/opt/debian-janitor/breezy/breezy/merge.py", line 661, in do_merge
    merge = self._do_merge_to()
  File "/opt/debian-janitor/breezy/breezy/merge.py", line 630, in _do_merge_to
    merge.do_merge()
  File "/opt/debian-janitor/breezy/breezy/merge.py", line 769, in do_merge
    self.working_tree.add_conflicts(self.cooked_conflicts)
  File "/opt/debian-janitor/breezy/breezy/git/workingtree.py", line 995, in add_conflicts
    encode_git_path(conflict.path), True)
  File "/opt/debian-janitor/breezy/breezy/git/workingtree.py", line 984, in _set_conflicted
    self.index[path] = (value[:9] + (value[9] | FLAG_STAGEMASK, ))
  File "/opt/debian-janitor/dulwich/dulwich/index.py", line 394, in __setitem__
    assert len(x) == len(IndexEntry._fields)
AssertionError

Full worker log