Run of fresh-releases for nvidia-persistenced

Try this locally (using silver-platter):

debian-svp new-upstream nvidia-persistenced 
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
Opening branch at https://salsa.debian.org/nvidia-team/nvidia-persistenced.git/,branch=master
Using cached branch file:///home/janitor/vcs/git/nvidia-persistenced/,branch=master
Resuming from branch file:///home/janitor/vcs/git/nvidia-persistenced/,branch=new-upstream
All changes applied successfully.
Total 161 (delta 97), reused 148 (delta 84), pack-reused 0
sed 87 (delta 17), pack-reused 0
340.108 does not point to a valid object
390.129 does not point to a valid object
390.132 does not point to a valid object
390.138 does not point to a valid object
418.74 does not point to a valid object
418.88 does not point to a valid object
Total 52 (delta 19), reused 46 (delta 13), pack-reused 0
340.108 does not point to a valid object
390.129 does not point to a valid object
390.132 does not point to a valid object
390.138 does not point to a valid object
418.74 does not point to a valid object
418.88 does not point to a valid object
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
340.108 does not point to a valid object
390.129 does not point to a valid object
390.132 does not point to a valid object
390.138 does not point to a valid object
418.74 does not point to a valid object
418.88 does not point to a valid object
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
340.108 does not point to a valid object
390.129 does not point to a valid object
390.132 does not point to a valid object
390.138 does not point to a valid object
418.74 does not point to a valid object
418.88 does not point to a valid object
(42/42), done.
Total 110 (delta 78), reused 99 (delta 67), pack-reused 0
Warning: criss-cross merge encountered.  See bzr help criss-cross.
Text conflict in 
Text conflict in debian/changelog
Text conflict in debian/patches/initscript.patch
restarting branch
All changes applied successfully.
Using upstream branch https://github.com/NVIDIA/nvidia-persistenced.git (from configuration)
Total 12 (delta 3), reused 10 (delta 1), pack-reused 0
Using version string 455.38.
No upstream upstream-revision format specified, trying tag:455.38
Using uscan to look for the upstream tarball.
/home/janitor/debian-janitor/dulwich/dulwich/repo.py:470: UserWarning: ref refs/tags/upstream/430.64 points at non-present sha 957113a85e4890eda885be1b47e89b19da8d4436
  warnings.warn(
/home/janitor/debian-janitor/dulwich/dulwich/repo.py:470: UserWarning: ref refs/tags/debian/435.21-1 points at non-present sha c104e86c4130db3e75ad185b93dbe91cfdbc6e4f
  warnings.warn(
/home/janitor/debian-janitor/dulwich/dulwich/repo.py:470: UserWarning: ref refs/tags/debian/430.64-1 points at non-present sha 5af46662656b7bf9c517cfd2693fdb229fd52966
  warnings.warn(
/home/janitor/debian-janitor/dulwich/dulwich/repo.py:470: UserWarning: ref refs/tags/debian/440.44-1 points at non-present sha d93d279d8e90811abda18c30cde323c1b0b23a9e
  warnings.warn(
/home/janitor/debian-janitor/dulwich/dulwich/repo.py:470: UserWarning: ref refs/tags/upstream/450.57 points at non-present sha 7a007e5b537c080fb8e9d8dab0626a586913dbb3
  warnings.warn(
/home/janitor/debian-janitor/dulwich/dulwich/repo.py:470: UserWarning: ref refs/tags/upstream/435.21 points at non-present sha cbf5cee8619a2f85a1574abf1f94c6353b8ccb79
  warnings.warn(
/home/janitor/debian-janitor/dulwich/dulwich/repo.py:470: UserWarning: ref refs/tags/debian/430.50-1 points at non-present sha 30e84e8cf2ea24f29019083206595037834ed2ea
  warnings.warn(
/home/janitor/debian-janitor/dulwich/dulwich/repo.py:470: UserWarning: ref refs/tags/upstream/440.44 points at non-present sha 36131b2da31846124bce275ec070e2fada07ff7e
  warnings.warn(
/home/janitor/debian-janitor/dulwich/dulwich/repo.py:470: UserWarning: ref refs/tags/upstream/430.50 points at non-present sha aa43743f6a7db0ffa204061efa13c937d7ee0497
  warnings.warn(
upstream/430.64 does not point to a valid object
debian/435.21-1 does not point to a valid object
debian/430.64-1 does not point to a valid object
debian/440.44-1 does not point to a valid object
upstream/450.57 does not point to a valid object
upstream/435.21 does not point to a valid object
debian/430.50-1 does not point to a valid object
upstream/440.44 does not point to a valid object
upstream/430.50 does not point to a valid object
Total 12 (delta 4), reused 9 (delta 1), pack-reused 0
340.108 does not point to a valid object
390.129 does not point to a valid object
390.132 does not point to a valid object
390.138 does not point to a valid object
418.74 does not point to a valid object
418.88 does not point to a valid object
450.80.02 does not point to a valid object
Elapsed time: 0:04:07.668292
Traceback (most recent call last):
  File "/usr/lib/python3.8/runpy.py", line 194, in _run_module_as_main
    return _run_code(code, main_globals, None,
  File "/usr/lib/python3.8/runpy.py", line 87, in _run_code
    exec(code, run_globals)
  File "/home/janitor/debian-janitor/janitor/worker.py", line 577, in <module>
    sys.exit(main())
  File "/home/janitor/debian-janitor/janitor/worker.py", line 534, in main
    with process_package(
  File "/usr/lib/python3.8/contextlib.py", line 113, in __enter__
    return next(self.gen)
  File "/home/janitor/debian-janitor/janitor/worker.py", line 432, in process_package
    changer_result = subworker.make_changes(
  File "/home/janitor/debian-janitor/janitor/worker.py", line 114, in make_changes
    return self.changer.make_changes(
  File "/home/janitor/debian-janitor/janitor/worker.py", line 148, in make_changes
    return super(NewUpstreamChanger, self).make_changes(
  File "/home/janitor/debian-janitor/silver-platter/silver_platter/debian/upstream.py", line 939, in make_changes
    result = merge_upstream(
  File "/home/janitor/debian-janitor/silver-platter/silver_platter/debian/upstream.py", line 740, in merge_upstream
    conflicts = do_merge(
  File "/home/janitor/.config/breezy/plugins/debian/merge_upstream.py", line 207, in do_merge
    return db.merge_upstream(
  File "/home/janitor/.config/breezy/plugins/debian/import_dsc.py", line 1325, in merge_upstream
    imported_revids = self.import_upstream(
  File "/home/janitor/.config/breezy/plugins/debian/import_dsc.py", line 843, in import_upstream
    (tag, revid) = self.pristine_upstream_source.import_component_tarball(
  File "/home/janitor/.config/breezy/plugins/debian/upstream/pristinetar.py", line 783, in import_component_tarball
    self.branch.pull(tree.branch, stop_revision=revid)
  File "/home/janitor/debian-janitor/breezy/breezy/branch.py", line 1043, in pull
    return InterBranch.get(source, self).pull(
  File "/home/janitor/debian-janitor/breezy/breezy/git/branch.py", line 1312, in pull
    self.target.generate_revision_history(
  File "/home/janitor/debian-janitor/breezy/breezy/git/branch.py", line 526, in generate_revision_history
    raise errors.DivergedBranches(self, other_branch)
breezy.errors.DivergedBranches: These branches have diverged. Use the missing command to see how.
Use the merge command to reconcile them.

Full worker log