From 3593459a0d274513b9b1e8206582c002f235bdf8 Mon Sep 17 00:00:00 2001 From: Mathias Klette Date: Tue, 28 May 2013 18:01:44 +0200 Subject: [PATCH] debian_build: change the way now to handle [merge] trigger --- debian_build.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian_build.py b/debian_build.py index 261a61b..ba13a65 100755 --- a/debian_build.py +++ b/debian_build.py @@ -342,9 +342,10 @@ if __name__ == '__main__': dst_branch = 'integration' # define the new branch local_branch = dst_branch # reset env for git-buildpackage # FIXME: error handling when rebase doesn't cleanly complete? - gitrepo.git.rebase('--onto', dst_branch, src_branch) + gitrepo.git.rebase(dst_branch) gitrepo.git.checkout(dst_branch) - logger.info('Checked out "{dst_branch}" branch after rebase completed from branch "{src_branch}".'.format( + gitrepo.git.merge(src_branch) + logger.info('Checked out "{dst_branch}" branch after rebase and merge completed from branch "{src_branch}".'.format( dst_branch=dst_branch, src_branch=src_branch, )) -- 2.39.5