From 61757c03f0d728897e9b0cd66e313851122125bd Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Fri, 26 Apr 2019 13:44:27 +0200 Subject: import_dsc: Support upstream-vcs-tag Closes: #782886 --- gbp/scripts/import_dsc.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gbp/scripts/import_dsc.py b/gbp/scripts/import_dsc.py index e7b89a65..7d6e4919 100644 --- a/gbp/scripts/import_dsc.py +++ b/gbp/scripts/import_dsc.py @@ -252,9 +252,12 @@ def import_upstream(repo, source, dsc, options): author = committer = {} commit_msg = "Import %s" % msg + upstream_parent = repo.vcs_tag_parent(options.vcs_tag, + dsc.upstream_version) commit = repo.commit_dir(source.unpacked, commit_msg, branch, + other_parents=upstream_parent, author=author, committer=committer) @@ -335,6 +338,7 @@ def build_parser(name): dest="upstream_branch") branch_group.add_boolean_config_file_option(option_name="create-missing-branches", dest="create_missing_branches") + branch_group.add_config_file_option(option_name="upstream-vcs-tag", dest="vcs_tag") tag_group.add_boolean_config_file_option(option_name="sign-tags", dest="sign_tags") -- cgit v1.2.3