mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-05 19:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

repo: add MutableRepo::merge_index

Browse source
This commit is contained in:
Benjamin Tan 2024-05-02 16:29:31 +08:00
parent ddc601fbf9
commit 87ea9102f0
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/src/repo.rs
View file

@ -1564,6 +1564,10 @@ impl MutableRepo {
self.view.mark_dirty(); self.view.mark_dirty();
} }
pub fn merge_index(&mut self, other_repo: &ReadonlyRepo) {
self.index.merge_in(other_repo.readonly_index());
}
fn merge_view(&mut self, base: &View, other: &View) { fn merge_view(&mut self, base: &View, other: &View) {
// Merge working-copy commits. If there's a conflict, we keep the self side. // Merge working-copy commits. If there's a conflict, we keep the self side.
for (workspace_id, base_wc_commit) in base.wc_commit_ids() { for (workspace_id, base_wc_commit) in base.wc_commit_ids() {