lint finds multiple target branch candidates which are actually resolvable
Bug #1706976 reported by
Robie Basak
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
git-ubuntu |
Fix Released
|
Medium
|
Nish Aravamudan |
Bug Description
"07/27/2017 14:32:39 - ERROR:Unable to automatically determine importer branch: Multiple candidate branches found: pkg/ubuntu/
In this (very common for SRUs) case, it should clearly be trusty-devel.
I think the logic should be that if all the found series and trees match, and -devel is included, then use the -devel.
If the trees don't match, then perhaps we are in a situation where something was deleted from proposed or something, so we need to still ask.
Related branches
~nacc/git-ubuntu:bug-fixes-2
- Robie Basak: Approve
-
Diff: 1648 lines (+758/-328)16 files modifiedgitubuntu/__main__.py (+4/-1)
gitubuntu/clone.py (+8/-5)
gitubuntu/git_repository.py (+398/-225)
gitubuntu/importer.py (+32/-12)
gitubuntu/importppa.py (+8/-2)
gitubuntu/lint.py (+210/-54)
gitubuntu/merge.py (+13/-5)
gitubuntu/queue.py (+12/-2)
gitubuntu/remote.py (+9/-2)
gitubuntu/run.py (+12/-9)
gitubuntu/submit.py (+10/-9)
gitubuntu/versioning.py (+2/-2)
snap/snapcraft.yaml (+1/-0)
tests/changelogs/test_versions_1 (+5/-0)
tests/changelogs/test_versions_2 (+11/-0)
tests/changelogs/test_versions_3 (+23/-0)
Changed in usd-importer: | |
milestone: | none → future |
Changed in usd-importer: | |
status: | Confirmed → Triaged |
Changed in usd-importer: | |
status: | Triaged → In Progress |
assignee: | nobody → Nish Aravamudan (nacc) |
Changed in usd-importer: | |
status: | In Progress → Fix Released |
To post a comment you must log in.
This seems pretty easy to do and makes sense. Probably can abstract out the logic the importer uses to move the -devel pointer to determine what the 'best' branch of a set of branches is?