Code

History

Commits on ig/docs-commitid to cli/tests/test_resolve_command.rs35+
  1. backend: add CopyId to TreeValue::FileMartin von Zweigbergk committed 1 year agoa363e6b
  2. cli: use more precise wording in conflict resolution hintVincent Ging Ho Yim committed 1 year agof176518
  3. cli: resolve: show a hint towards editing the conflict markers manually if the conflict has >2 sidesWinter committed 1 year ago2d1f50a
  4. git: write change-id header by defaultMartin von Zweigbergk committed 1 year agoacd8242
  5. cli: resolve: do not use .with_new_file_ids() to construct resolved file valueYuya Nishihara committed 1 year agofa00775
  6. cli: resolve: error out early if conflict in exec bit couldn't be resolvedYuya Nishihara committed 1 year agoace0a52
  7. cli: resolve: update "not normal files" error message and formattingYuya Nishihara committed 1 year ago1e94ee2
  8. merge_tools: fix `:ours` and `:theirs` merge toolsScott Taylor committed 1 year ago12add9b
  9. merge_tools: demo issue with `:ours` and `:theirs`Scott Taylor committed 1 year ago466d237
  10. merge_tools: add ":ours" and ":theirs" merge toolsScott Taylor committed 1 year agoa902e63
  11. tests: port test_resolve_command.rs to TestWorkDir APIYuya Nishihara committed 1 year ago3ba2ea7
  12. tests: set up fake editor early in test_{resolve,restore}_command.rsYuya Nishihara committed 1 year ago169a8b3
  13. cli: Print @ and @- in status and print_updated_working_copy_statsRobin Stocker committed 1 year ago0456701
  14. cli: truncate list of newly conflicted commitsYuya Nishihara committed 1 year agoc2f2461
  15. tests: pass &TestWorkDir to create_commit*() helperYuya Nishihara committed 1 year ago61a4495
  16. cli tests: move `create_commit()` tests helpers to common/Martin von Zweigbergk committed 1 year ago0055cd4
  17. tests: run `insta --force-update-snapshots`Ilya Grigoriev committed 1 year ago5eae2d9
  18. tests: normalize formatting in insta macro that could leave trailing whitespaceYuya Nishihara committed 1 year ago2fd842e
  19. tests: resolve directory path to run_jj_in() relative to env_rootYuya Nishihara committed 1 year ago7fa8420
  20. tests: migrate non-snapshot users of jj_cmd_ok() to run_jj_in().success()Yuya Nishihara committed 1 year ago804d175
  21. tests: migrate snapshot users of jj_cmd_ok() to run_jj_in()Yuya Nishihara committed 1 year ago3193513
  22. tests: migrate snapshot users of jj_cmd_success() to run_jj_in()Yuya Nishihara committed 1 year agocdcc777
  23. tests: migrate callers of jj_cmd_cli_error() to run_jj_in()Yuya Nishihara committed 1 year agob79b29c
  24. tests: migrate callers of jj_cmd_failure() to run_jj_in()Yuya Nishihara committed 1 year agod19e58f
  25. tests: stop using assert_eq!() in cli tests where possibleYuya Nishihara committed 1 year ago696cfee
  26. tests: migrate some jj_cmd_success() output wrappers to run_jj_in()Yuya Nishihara committed 1 year agof1cd3a4
  27. tests: migrate some helper functions that uses jj_cmd_*() to run_jj_in()Yuya Nishihara committed 1 year ago18ea718
  28. tests: migrate users of normalize_exit_status() to run_jj_in() functionYuya Nishihara committed 1 year agocf7f1df
  29. cli: add "Hint: " prefix to conflict hintsYuya Nishihara committed 1 year ago48b0222
  30. cli: render "conflicts" message as warningYuya Nishihara committed 1 year agoa2a9a99
  31. tests: add [EOF] marker to command output when displayingYuya Nishihara committed 1 year ago630036e
  32. tests: add CommandOutputString wrapperYuya Nishihara committed 1 year agoa541652
  33. bookmarks: First step to make target revision a required argument to bookmark create/move/set.David Rieber committed 1 year agodd73b5a
  34. resolve: try to resolve all conflicted files in filesetScott Taylor committed 1 year ago7df0f16
  35. merge_tools: add "$marker_length" variableScott Taylor committed 1 year ago542d09c