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

tests: using a more universal rebase call

In Mercurial 5.3, `source` and `base` are single valued, hence
just a string, whereas in current default branch, future 5.4,
they become lists.

We could fix that by version introspection, but in that case, we're
rebasing a topic with a single changeset, so that switching to
the implicit form, or `rev`, which is already expected to be
a list should work for both versions.
parent a54f2f78
No related branches found
No related tags found
No related merge requests found
......@@ -521,7 +521,7 @@
'branch/default': 'default1',
'topic/default/zzetop': 'in topic'}
wrapper.command('rebase', base='zzetop')
wrapper.command('rebase', rev=['zzetop'])
wrapper.set_phase('public', ['zzetop'])
wrapper.command('gitlab-mirror')
......@@ -558,7 +558,7 @@
'topic/default/zzetop': 'in topic'}
wrapper.write_commit('zz', message='topic addition')
wrapper.command('rebase', base='zzetop')
wrapper.command('rebase')
wrapper.set_phase('public', ['zzetop'])
wrapper.command('gitlab-mirror')
......
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