Mercurial > kallithea
changeset 7349:6ce04fd9efd4
hg: fix 4.7 compatibility in checkout_branch
Test coverage by workdir tests.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Wed, 08 Aug 2018 02:21:31 +0200 |
| parents | b45994c0779e |
| children | 30b5b58cb2dc |
| files | kallithea/lib/vcs/backends/hg/workdir.py |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/lib/vcs/backends/hg/workdir.py Mon Aug 06 01:05:18 2018 +0200 +++ b/kallithea/lib/vcs/backends/hg/workdir.py Wed Aug 08 02:21:31 2018 +0200 @@ -19,4 +19,5 @@ if branch not in self.repository.branches: raise BranchDoesNotExistError - hg_merge.update(self.repository._repo, branch, False, False, None) + raw_id = self.repository.branches[branch] + hg_merge.update(self.repository._repo, raw_id, False, False, None)