Commit 7675ff53 authored by Georges Racinet's avatar Georges Racinet 🦑
Browse files

Bookmarks: native projects now behave exactly as hg-git projects

This is thanks to the state file, which can record also the
difference between the pure Mercurial logic and what GitLab sees.
parent 9ad2c8b183eb
Pipeline #14997 passed with stage
in 31 minutes and 20 seconds
...@@ -213,15 +213,9 @@ def test_implicit_move(test_project, tmpdir): ...@@ -213,15 +213,9 @@ def test_implicit_move(test_project, tmpdir):
gl_branches = { gl_branches = {
'branch/default': 'Commit on default', 'branch/default': 'Commit on default',
'sliding': 'Commit 2', 'sliding': 'Commit 2',
'branch/other': 'Commit 2',
} }
if not test_project.hg_native:
# not shadowing the branch is a divergence of state
# between hg and git that cannot sanely be reproduced
# in the native case. See heptapod#143 for the origin of this
# non-shadowing feature
gl_branches['branch/other'] = 'Commit 2'
assert test_project.api_branch_titles() == gl_branches assert test_project.api_branch_titles() == gl_branches
if test_project.hg_native: if test_project.hg_native:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment