##// END OF EJS Templates
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.
marcink -
r2784:e8c62649 default
Show More
Name Size Modified Last Commit Author
/ rhodecode / tests / vcs
__init__.py Loading ...
conftest.py Loading ...
test_archives.py Loading ...
test_branches.py Loading ...
test_client_http.py Loading ...
test_commits.py Loading ...
test_config.py Loading ...
test_diff.py Loading ...
test_exceptions.py Loading ...
test_filenodes_unicode_path.py Loading ...
test_getitem.py Loading ...
test_getslice.py Loading ...
test_git.py Loading ...
test_hg.py Loading ...
test_hg_vcsserver_cache_invalidation.py Loading ...
test_inmemory.py Loading ...
test_load.py Loading ...
test_nodes.py Loading ...
test_repository.py Loading ...
test_svn.py Loading ...
test_tags.py Loading ...
test_utils.py Loading ...
test_vcs.py Loading ...
utils.py Loading ...