diff options
| author | Guido Guenther <agx@sigxcpu.org> | 2008-09-22 19:48:39 +0200 |
|---|---|---|
| committer | Guido Guenther <agx@sigxcpu.org> | 2008-09-22 20:07:00 +0200 |
| commit | 745fbf6ecb43f4f68f2b94cfef2f5e63fac60d99 (patch) | |
| tree | 1b8127630cbaccde148ce6d30f0a9b943b148ed4 /git-import-dsc | |
| parent | bbf50209fe1443a40bb1535503bc7112be22dba6 (diff) | |
merge by default when importing into an existing archive
can be skipped using --no-merge
Closes: #475571
Diffstat (limited to 'git-import-dsc')
| -rwxr-xr-x | git-import-dsc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/git-import-dsc b/git-import-dsc index e1865d51..4755efdb 100755 --- a/git-import-dsc +++ b/git-import-dsc @@ -136,6 +136,8 @@ def main(argv): help="branch the debian patch is being developed on, default is '%(debian-branch)s'") parser.add_config_file_option(option_name="upstream-branch", dest="upstream_branch", help="upstream branch, default is '%(upstream-branch)s'") + parser.add_option("--no-merge", dest='merge', action="store_false", default=True, + help="after import dont do any merging to another branch") parser.add_config_file_option(option_name="sign-tags", dest="sign_tags", help="sign git tags", action="store_true") parser.add_config_file_option(option_name="keyid", dest="keyid", @@ -210,6 +212,12 @@ def main(argv): gbpc.PristineTar().commit(src.tgz, options.upstream_branch) if not src.native: gbpc.GitCheckoutBranch(options.debian_branch)() + if options.merge: + print "Merging to %s" % options.debian_branch + try: + gbpc.GitMerge(options.upstream_branch)() + except gbpc.CommandExecFailed: + raise GbpError, """Merge of %s failed, please resolve manually""" % options.upstream_branch repo.replace_tree(unpack_dir, options.filters) apply_debian_patch(src, dirs, options) except gbpc.CommandExecFailed: |