##// 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 / fixtures
diff_with_diff_data.diff Loading ...
git_diff_binary_and_normal.diff Loading ...
git_diff_binary_special_files.diff Loading ...
git_diff_binary_special_files_2.diff Loading ...
git_diff_chmod.diff Loading ...
git_diff_mod_single_binary_file.diff Loading ...
git_diff_rename_file.diff Loading ...
git_diff_rename_file_with_spaces.diff Loading ...
git_node_history_response.json Loading ...
hg_diff_add_single_binary_file.diff Loading ...
hg_diff_binary_and_normal.diff Loading ...
hg_diff_chmod.diff Loading ...
hg_diff_chmod_and_mod_single_binary_file.diff Loading ...
hg_diff_copy_and_chmod_file.diff Loading ...
hg_diff_copy_and_modify_file.diff Loading ...
hg_diff_copy_chmod_and_edit_file.diff Loading ...
hg_diff_copy_file.diff Loading ...
hg_diff_copy_file_with_spaces.diff Loading ...
hg_diff_del_single_binary_file.diff Loading ...
hg_diff_double_file_change_double_newline.diff Loading ...
hg_diff_double_file_change_newline.diff Loading ...
hg_diff_four_file_change_newline.diff Loading ...
hg_diff_mixed_filename_encodings.diff Loading ...
hg_diff_mod_file_and_rename.diff Loading ...
hg_diff_mod_single_binary_file.diff Loading ...
hg_diff_mod_single_file_and_rename_and_chmod.diff Loading ...
hg_diff_no_newline.diff Loading ...
hg_diff_rename_and_chmod_file.diff Loading ...
hg_diff_rename_file.diff Loading ...
hg_diff_rename_file_with_spaces.diff Loading ...
hg_diff_single_file_change_newline.diff Loading ...
hg_node_history_response.json Loading ...
journal_dump.csv Loading ...
large_diff.diff Loading ...
svn_diff_binary_add_file.diff Loading ...
svn_diff_multiple_changes.diff Loading ...
svn_node_history_branches.json Loading ...
svn_node_history_response.json Loading ...