Historically adopted upload tags may not satisfy new rules
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
git-ubuntu |
New
|
Undecided
|
Unassigned |
Bug Description
We are attempting (or will be) to assert that when an upload tag is integrated into the rich history (by pointing an import tag directly at it), the upload tag has an appropriate changelog parent already present in its ancestry (that is an import tag (or reimport tag) of the parent changelog version is ancestor). This was not strictly enforced in the past, and so there are upload tags in the history (e.g., ntp) that do not satisfy our new rules.
$ git ubuntu merge start --force --verbose pkg/ubuntu/devel pkg/debian/sid
05/31/2018 16:40:48 - DEBUG:Executing: git config gitubuntu.lpuser
05/31/2018 16:40:48 - DEBUG:Executing: grep -q "* -ident" /home/nacc/
05/31/2018 16:40:48 - DEBUG:Executing: grep -q "* -text" /home/nacc/
05/31/2018 16:40:48 - DEBUG:Executing: grep -q "* -eol" /home/nacc/
05/31/2018 16:40:48 - DEBUG:Executing: git config gitubuntu.lpuser
05/31/2018 16:40:48 - DEBUG:Executing: sh -c "dpkg-parsechan
05/31/2018 16:40:48 - DEBUG:Executing: sh -c "dpkg-parsechan
05/31/2018 16:40:48 - DEBUG:Executing: sh -c "dpkg-parsechan
05/31/2018 16:40:49 - DEBUG:Executing: sh -c "dpkg-parsechan
05/31/2018 16:40:49 - DEBUG:Executing: git status --porcelain
05/31/2018 16:40:49 - DEBUG:Executing: sh -c "dpkg-parsechan
05/31/2018 16:40:49 - DEBUG:Executing: git merge-base --is-ancestor e96ae83aca626b8
05/31/2018 16:40:49 - DEBUG:Executing: sh -c "dpkg-parsechan
05/31/2018 16:40:49 - DEBUG:Executing: sh -c "dpkg-parsechan
05/31/2018 16:40:49 - DEBUG:Executing: git tag old/ubuntu pkg/ubuntu/devel -f
05/31/2018 16:40:49 - DEBUG:Executing: sh -c "dpkg-parsechan
05/31/2018 16:40:49 - DEBUG:Executing: sh -c "dpkg-parsechan
05/31/2018 16:40:49 - INFO:Created tag old/ubuntu for version 1:4.2.8p10+
05/31/2018 16:40:49 - DEBUG:Executing: git tag old/debian e96ae83aca626b8
05/31/2018 16:40:49 - INFO:Created tag old/debian for version 1:4.2.8p10+dfsg-5
05/31/2018 16:40:49 - DEBUG:Executing: git tag new/debian pkg/debian/sid -f
05/31/2018 16:40:49 - INFO:Created tag new/debian for version 1:4.2.8p11+dfsg-1
05/31/2018 16:40:49 - DEBUG:Executing: git checkout e96ae83aca626b8
05/31/2018 16:40:49 - DEBUG:Executing: git rev-list --ancestry-path --reverse e96ae83aca626b8
05/31/2018 16:40:49 - DEBUG:Executing: git cherry-pick --allow-empty --keep-
05/31/2018 16:40:49 - DEBUG:Executing: git cherry-pick --allow-empty --keep-
05/31/2018 16:40:49 - DEBUG:Executing: git cherry-pick --allow-empty --keep-
05/31/2018 16:40:49 - ERROR:Command exited 1: git cherry-pick --allow-empty --keep-
05/31/2018 16:40:49 - ERROR:stdout:
05/31/2018 16:40:49 - ERROR:stderr: error: could not apply b524a1e5... Import patches-unapplied version 1:4.2.8p10+
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Traceback (most recent call last):
File "/snap/
load_
File "/snap/
sys.
File "/snap/
subcommand=
File "/snap/
tag_only,
File "/snap/
do_
File "/snap/
repo.
File "/snap/
**kwargs,
File "/snap/
return run(['git'] + list(args), env=env, **kwargs)
File "/snap/
raise e
File "/snap/
stdout=stdout, stderr=stderr, stdin=stdin)
File "/snap/
output=stdout, stderr=stderr)
subprocess.
Taking a look 1f212b7ebb448ee
Merge: 3d189227 6a986e2b
The first is the import tag of 1%4.2.8p10+
I'm doing a no-push reimport of ntp off my importer-fix-tests branch. I suspect in that case, the upload tag above will end up not being integrated into the import tags. Will report back once I get results.