diff options
author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2010-08-07 10:49:47 +0200 |
---|---|---|
committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2010-08-07 10:49:47 +0200 |
commit | 61a6c4bd06e945cec8cd60ce61bcba60ff7ec10b (patch) | |
tree | 0431838b4e25db059294a95f3ecd9eedeb9a1132 | |
parent | 92f39df69446e59e24c2f31ac6f8afd266edf1db (diff) | |
download | fedora-packager-61a6c4bd06e945cec8cd60ce61bcba60ff7ec10b.tar.gz fedora-packager-61a6c4bd06e945cec8cd60ce61bcba60ff7ec10b.tar.xz fedora-packager-61a6c4bd06e945cec8cd60ce61bcba60ff7ec10b.zip |
After initial-merge, switch-branch to newest one
-rwxr-xr-x | src/pyfedpkg/initial_merge.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/pyfedpkg/initial_merge.py b/src/pyfedpkg/initial_merge.py index 50c0b04..be5782f 100755 --- a/src/pyfedpkg/initial_merge.py +++ b/src/pyfedpkg/initial_merge.py @@ -99,6 +99,7 @@ def do_initial_merge(into, to_merge): switch_branch(t.localbranch) ret = run_cmd(['git', 'merge', into.localbranch]) assert(ret == 0) + switch_branch(into.localbranch) class Consumer: |