ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/lib/tests
Martin von Zweigbergk 57ba9a9409 git: when importing refs, abandon commits that were abandoned in git
Now that I'm using GitHub PRs instead of pushing directly to the main
branch, it's quite annoying to have to abandon the old commits after
GitHub rebases them. This patch makes it so we compare the remote's
previous heads to the new heads and abandons any commits that were
removed on the remote. As usual, that means that descendants get
rebased onto the closest remaining commit.

This is half of #241. The other half is to detect rewritten branches
and rebase on top.
2022-04-28 11:28:09 -07:00
..
test_bad_locking.rs repo: when merging in removed head, rebase descendants (#111) 2022-03-26 22:31:49 -07:00
test_commit_builder.rs transaction: check that we haven't forgotten to rebase descendants (#111) 2022-03-26 22:31:49 -07:00
test_commit_concurrent.rs repo: when merging in removed head, rebase descendants (#111) 2022-03-26 22:31:49 -07:00
test_conflicts.rs backend: pass in path when reading/writing conflicts as well 2022-03-31 10:23:33 -07:00
test_diff_summary.rs
test_git.rs git: when importing refs, abandon commits that were abandoned in git 2022-04-28 11:28:09 -07:00
test_index.rs repo: clarify that some repo functions load the repo at head (#111) 2022-03-26 22:31:49 -07:00
test_init.rs cleanup: replace .tree().id() by tree_id() to avoid looking up trees 2022-04-21 21:54:52 -07:00
test_load_repo.rs repo: when merging in removed head, rebase descendants (#111) 2022-03-26 22:31:49 -07:00
test_merge_trees.rs trees: when merging trees and one is missing, treat it as empty 2022-04-20 13:47:03 -07:00
test_mut_repo.rs cleanup: replace .tree().id() by tree_id() to avoid looking up trees 2022-04-21 21:54:52 -07:00
test_operations.rs repo: when merging in removed head, rebase descendants (#111) 2022-03-26 22:31:49 -07:00
test_refs.rs
test_revset.rs revset: add a roots() function 2022-04-13 23:24:51 -07:00
test_revset_graph_iterator.rs
test_rewrite.rs rewrite: don't rewrite the "removed" side of a branch conflict 2022-04-28 11:28:09 -07:00
test_view.rs repo: when merging in removed head, rebase descendants (#111) 2022-03-26 22:31:49 -07:00
test_working_copy.rs working_copy: record sparse patterns in the tree state (#52) 2022-04-26 14:52:17 -07:00
test_working_copy_concurrent.rs working_copy: let caller pass in base Git ignores (#65, #87) 2022-03-12 10:48:06 -08:00
test_working_copy_sparse.rs working_copy: respect sparse patterns when writing tree (#52) 2022-04-26 14:52:17 -07:00
test_workspace.rs workspace: canonicalize workspace and repo paths internally 2022-03-30 22:09:55 -07:00