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

pull_force_topic: removed duplicated test_empty_pull

the one from test_pull_force_topic is more interesting, as
it matches more closely the practical case (revision already
pulled, not remote empty repo)
parent 60b716a5
No related branches found
No related tags found
No related merge requests found
......@@ -85,23 +85,6 @@
cleanup_tmp_bundle(ui, None, str(path))
def test_empy_pull(tmpdir):
"""Case where the pull is actually empty
This can happen if a remote pull-request is still open
while effectively merged, or if undetected duplicates are imported one
after the other
"""
main_path = tmpdir.join('main')
fork_path = tmpdir.join('fork')
main, base_ctx = make_main_repo(main_path)
fork = LocalRepoWrapper.init(fork_path)
fork.command('pull', str(main_path), rev=[base_ctx.hex()])
main.command('pull-force-topic', 'zetop', source=str(fork_path))
def test_already_obsolete(tmpdir):
"""Case where a remote changeset is locally obsolete
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment