mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-12 15:16:35 +00:00
26a554818a
When we export branches to Git, we didn't update our own record of Git's refs. This frequently led to spurious conflicts in these refs (e.g. #463). This is typically what happened: 1. Import a branch pointing to commit A from Git 2. Modify the branch in jj to point to commit B 3. Export the branch to Git 4. Update the branch in Git to point to commit C 5. Import refs from Git In step 3, we forgot to update our record of the branch in the repo view's `git_refs` field. That led to the import in step 5 to think that the branch moved from A to C in Git, which conflicts with the internal branch target of B. This commit fixes the bug by updating the refs in the `MutableRepo`. Closes #463. |
||
|---|---|---|
| .. | ||
| common | ||
| test_alias.rs | ||
| test_branch_command.rs | ||
| test_checkout.rs | ||
| test_commit_command.rs | ||
| test_concurrent_operations.rs | ||
| test_describe_command.rs | ||
| test_diff_command.rs | ||
| test_edit_command.rs | ||
| test_git_clone.rs | ||
| test_git_colocated.rs | ||
| test_git_push.rs | ||
| test_git_remotes.rs | ||
| test_gitignores.rs | ||
| test_global_opts.rs | ||
| test_init_command.rs | ||
| test_interdiff_command.rs | ||
| test_log_command.rs | ||
| test_move_command.rs | ||
| test_new_command.rs | ||
| test_obslog_command.rs | ||
| test_operations.rs | ||
| test_print_command.rs | ||
| test_rebase_command.rs | ||
| test_restore_command.rs | ||
| test_revset_output.rs | ||
| test_sparse_command.rs | ||
| test_split_command.rs | ||
| test_squash_command.rs | ||
| test_templater.rs | ||
| test_touchup_command.rs | ||
| test_undo.rs | ||
| test_unsquash_command.rs | ||
| test_untrack_command.rs | ||
| test_workspaces.rs | ||