Skip to content
Snippets Groups Projects
Commit 77bd493a61b5 authored by Georges Racinet's avatar Georges Racinet
Browse files

install_heptapod: fixed pull_branch bug for heptapod-shell

optional arg wasn't forwarded, everything was hence supposed
to happen in the 'heptapod' branch, that doesn't fit the
release branches.
parent f85418e1f6e3
No related branches found
Tags heptapod-0.7.0
No related merge requests found
......@@ -218,7 +218,8 @@
if not is_hg_repo(SHELL_DIR):
logger.warn("%s is not a Mercurial repo yet. Running the "
"full-blown installation.", SHELL_DIR)
return init_shell(revision=revision, remote=remote)
return init_shell(revision=revision, remote=remote,
branch=pull_branch)
hg_pull_upd(SHELL_DIR, remote, revision, pull_branch=pull_branch,
add_upd_opts=('--merge', ))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment