

def test_sync_branch_devel_no_ff(qisrc_action, git_server, test_git):
    git_server.create_repo('foo.git')
    qisrc_action('init', git_server.manifest_url)
    git_server.push_file('foo.git', 'foo.txt', 'a super change')
    git_worktree = TestGitWorkTree()
    foo = git_worktree.get_git_project('foo')
    test_git = TestGit(foo.path)
    test_git.commit_file('foo.git', 'div.txt', 'diverging from master')
    master_sha1 = test_git.get_ref_sha1('refs/heads/master')
    test_git.call('checkout', '-b', 'devel')
    test_git.commit_file('developing.txt', 'like a boss')
    git_server.push_file('foo.git', 'foobar.txt', 'some other change')
    qisrc_action('sync', '--rebase-devel')
    assert (test_git.get_ref_sha1('refs/heads/master') == master_sha1)

dataset/ETHPy150Open aldebaran/qibuild/python/qisrc/test/test_qisrc_sync.py test_sync_branch_devel_no_ff/original