ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/tests
Martin von Zweigbergk a0573b1737 cli: add a command for updating a stale working copy
When a workspace's working-copy commit is updated from another
workspace, the workspace becomes "stale". That means that the working
copy on disk doesn't represent the commit that the repo's view says it
should. In this state, we currently automatically it to the desired
commit next time the user runs any command in the workspace. That can
be undesirable e.g. if the user had a slow build or test run started
in the working copy. It can also be surprising that a checkout happens
when the user ran a seemingly readonly command like `jj status`.

This patch makes most commands instead error out if the working copy
is stale, and adds a `jj workspace update-stale` to update it. The
user can still run commands with `--no-commit-working-copy` in this
state (doing e.g. `jj --no-commit-working-copy rebase -r @ -d @--` is
another way of getting into the stale-working-copy state, by the way).
2022-12-05 08:50:52 -08:00
..
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_export.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_resolve_command.rs
test_restore_command.rs
test_revset_output.rs
test_show_command.rs
test_sparse_command.rs
test_split_command.rs
test_squash_command.rs
test_status_command.rs
test_templater.rs
test_touchup_command.rs
test_undo.rs
test_unsquash_command.rs
test_untrack_command.rs
test_workspaces.rs