jj: Difficult-to-recove-from crash after `jj duplicate`.
I’ve had a problem similar to https://github.com/martinvonz/jj/issues/635, except this time I don’t quite know how to recover. None of jj log, jj op log worked. I found that jj --at-operation @- op log works, but I don’t know how to use that. Here is the repository state: jj-repo.tar.gz.
I do remember using jj duplicate at some point. I didn’t do any explicit rebases, but I did use jj edit and tried to change a file.
I think jj should provide some way to recover from this.
An example of the error:
$ RUST_BACKTRACE=1 jj op log
thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: Other("Git commit '18a7eceb66e7d1eb757bc34ff018a9987fe4735d' already exists with different associated non-Git meta-data")', lib/src/store.rs:87:60
stack backtrace:
0: rust_begin_unwind
at /rustc/a31705549837622a3c3c27e98c9d8a6d820a984b/library/std/src/panicking.rs:584:5
1: core::panicking::panic_fmt
at /rustc/a31705549837622a3c3c27e98c9d8a6d820a984b/library/core/src/panicking.rs:142:14
2: core::result::unwrap_failed
at /rustc/a31705549837622a3c3c27e98c9d8a6d820a984b/library/core/src/result.rs:1785:5
3: jujutsu_lib::store::Store::write_commit
4: jujutsu_lib::commit_builder::CommitBuilder::write_to_repo
5: jujutsu_lib::rewrite::rebase_commit
6: jujutsu_lib::rewrite::DescendantRebaser::rebase_next
7: jujutsu_lib::rewrite::DescendantRebaser::rebase_all
8: jujutsu_lib::repo::MutableRepo::rebase_descendants
9: jujutsu::cli_util::WorkspaceCommandHelper::snapshot
10: jujutsu::cli_util::CommandHelper::workspace_helper
11: jujutsu::commands::run_command
12: jj::main
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
About this issue
- Original URL
- State: closed
- Created 2 years ago
- Comments: 15 (6 by maintainers)
Commits related to this issue
- Thoughts about fixing #694 — committed to ilyagr/jj by ilyagr a year ago
- Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/694 — committed to martinvonz/jj by ilyagr a year ago
- Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/694 — committed to martinvonz/jj by ilyagr a year ago
- Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/694 — committed to martinvonz/jj by ilyagr a year ago
- Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/694 — committed to martinvonz/jj by ilyagr a year ago
- Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/694 — committed to martinvonz/jj by ilyagr a year ago
- Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/694 — committed to martinvonz/jj by ilyagr a year ago
- Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/694 — committed to martinvonz/jj by ilyagr a year ago
- Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/694 — committed to martinvonz/jj by ilyagr a year ago
- Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/694 — committed to martinvonz/jj by ilyagr a year ago
- Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/694 — committed to martinvonz/jj by ilyagr a year ago
- Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/694 — committed to martinvonz/jj by ilyagr a year ago
- Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/694 — committed to martinvonz/jj by ilyagr a year ago
- Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/694 — committed to martinvonz/jj by ilyagr a year ago
- Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/694 — committed to martinvonz/jj by ilyagr a year ago
- Git backend: Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/694 — committed to martinvonz/jj by ilyagr a year ago
- Git backend: Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/694 — committed to martinvonz/jj by ilyagr a year ago
- Git backend: Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/694 — committed to martinvonz/jj by ilyagr a year ago
- Git backend: Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/694 — committed to martinvonz/jj by ilyagr a year ago
- Git backend: Allow simultaneous rebasing of duplicate commits Fixes https://github.com/martinvonz/jj/issues/694 — committed to martinvonz/jj by ilyagr a year ago
It wasn’t as easy as that, but your advice helped very much.
jj --no-commit-working-copy op logworks, butjj --no-commit-working-copy op undowasn’t sufficient. After trying a few options,jj --no-commit-working-copy op restore ee5fbrestored me to a reasonable state.Thanks!