Code

History

Commits on git-sync to cli/tests/test_restore_command.rs35+
  1. logging: Add trailing periods in log messagesJoseph Lou committed 4 months agod6c4fa8
  2. tests: Replace Result.unwrap with ? operator in test functionsGaëtan Lehmann committed 7 months agoacee40c
  3. tests: run `cargo insta test --force-update-snapshots`Ilya Grigoriev committed 8 months ago3a9e56d
  4. git_backend: use first tree as base tree for conflictsScott Taylor committed 1 year agoc1ecf8a
  5. rewrite: preserve conflict labels when restoring treesScott Taylor committed 10 months ago5c7b5f5
  6. conflicts: use "revision" instead of "commit" in labelsScott Taylor committed 10 months ago389c778
  7. rewrite: add conflict labels for rebased commitsScott Taylor committed 1 year ago144ba76
  8. rewrite: add conflict labels when merging commit treesScott Taylor committed 1 year ago04a9121
  9. conflicts: update conflict marker formatScott Taylor committed 11 months agoba73442
  10. docs: jj-vcs.github.io -> jj-vcs.devSteve Klabnik committed 11 months ago5b3aa51
  11. cli: `jj restore` warns when fileset doesn't existTejas Sanap committed 1 year agoa68651d
  12. tests: do not use "jj undo" to run multiple tests with the same setupYuya Nishihara committed 1 year agob384097
  13. tests: insert explicit snapshot after setting up test workspaceYuya Nishihara committed 1 year ago827a87f
  14. cli: restore: adjust error message for `--revision`Daniel Luz committed 1 year ago436e8bb
  15. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  16. cli: use more precise wording in conflict resolution hintVincent Ging Ho Yim committed 1 year agof176518
  17. git: write change-id header by defaultMartin von Zweigbergk committed 1 year agoacd8242
  18. restore, diffedit: do not output "Created ..." message, which dates back to before we couldn't lookup by change id.Steve Fink committed 1 year ago0eceed9
  19. tests: port test_restore_command.rs to TestWorkDir APIYuya Nishihara committed 1 year ago4d4de68
  20. tests: set up fake editor early in test_{resolve,restore}_command.rsYuya Nishihara committed 1 year ago169a8b3
  21. cli: Print @ and @- in status and print_updated_working_copy_statsRobin Stocker committed 1 year ago0456701
  22. cli: truncate list of newly conflicted commitsYuya Nishihara committed 1 year agoc2f2461
  23. tests: pass &TestWorkDir to create_commit*() helperYuya Nishihara committed 1 year ago61a4495
  24. cli tests: move `create_commit()` tests helpers to common/Martin von Zweigbergk committed 1 year ago0055cd4
  25. tests: run `insta --force-update-snapshots`Ilya Grigoriev committed 1 year ago5eae2d9
  26. tests: normalize formatting in insta macro that could leave trailing whitespaceYuya Nishihara committed 1 year ago2fd842e
  27. tests: resolve directory path to run_jj_in() relative to env_rootYuya Nishihara committed 1 year ago7fa8420
  28. tests: migrate non-snapshot users of jj_cmd_ok() to run_jj_in().success()Yuya Nishihara committed 1 year ago804d175
  29. tests: migrate snapshot users of jj_cmd_ok() to run_jj_in()Yuya Nishihara committed 1 year ago3193513
  30. tests: migrate snapshot users of jj_cmd_success() to run_jj_in()Yuya Nishihara committed 1 year agocdcc777
  31. tests: migrate callers of jj_cmd_failure() to run_jj_in()Yuya Nishihara committed 1 year agod19e58f
  32. tests: migrate some jj_cmd_success() output wrappers to run_jj_in()Yuya Nishihara committed 1 year agof1cd3a4
  33. tests: migrate some helper functions that uses jj_cmd_*() to run_jj_in()Yuya Nishihara committed 1 year ago18ea718
  34. cli: add "Hint: " prefix to conflict hintsYuya Nishihara committed 1 year ago48b0222
  35. cli: render "conflicts" message as warningYuya Nishihara committed 1 year agoa2a9a99