diff options
| author | Guido Günther <agx@sigxcpu.org> | 2011-10-23 13:40:07 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2011-10-23 16:20:33 +0200 |
| commit | 240ce9ffb29fc4fbfee071eff0bfa2e7ff795fd9 (patch) | |
| tree | 2e6a16e5e87d7126063eb08e9cbfb0765e7b8f50 /git-import-orig | |
| parent | e9e382ef3b26143787aa6d9d0b7a6d5df64c3057 (diff) | |
Replace GitMerge by GitRepository.merge()
Diffstat (limited to 'git-import-orig')
| -rwxr-xr-x | git-import-orig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-import-orig b/git-import-orig index c0ee20ab..d9bc077e 100755 --- a/git-import-orig +++ b/git-import-orig @@ -399,7 +399,7 @@ def main(argv): gbp.log.info("Merging to '%s'" % options.debian_branch) repo.set_branch(options.debian_branch) try: - gbpc.GitMerge(tag)() + repo.merge(tag) except gbpc.CommandExecFailed: raise GbpError, """Merge failed, please resolve.""" if options.postimport: |