Code

History

Commits on ig/conflictsimp to cli/tests/test_split_command.rs35+
  1. config: migrate ui.default-description to template aliasYuya Nishihara committed 1 year agoaf9c608
  2. split: add trailer supportGaëtan Lehmann committed 1 year agofae66ac
  3. cli: deprecate ui.default-descriptionWinter committed 1 year agoaf60f3d
  4. tests: port test_split_command.rs to TestWorkDir APIYuya Nishihara committed 1 year ago87a35d5
  5. tests: set up fake editor early in test_{split,squash}_command.rsYuya Nishihara committed 1 year agof2ca6b7
  6. cli: pad empty description intro/instruction lines with "JJ:"Yuya Nishihara committed 1 year ago4bcebe6
  7. cli: make description template insert blank line if old description was emptyYuya Nishihara committed 1 year agofd05b6f
  8. cli: Print @ and @- in status and print_updated_working_copy_statsRobin Stocker committed 1 year ago0456701
  9. cli split: Check the evolog in two testsEvan Mesterhazy committed 1 year ago83ce245
  10. cli split: Rename "siblings" test to "parallel"Evan Mesterhazy committed 1 year ago6ba5a76
  11. cli split: Add a simple split with descendants testEvan Mesterhazy committed 1 year agobb78c06
  12. cli split: Explain how the diff script works in test_split_interactive_with_pathsEvan Mesterhazy committed 1 year agob627924
  13. tests: run `insta --force-update-snapshots`Ilya Grigoriev committed 1 year ago5eae2d9
  14. cli split: Disable the new bookmark behavior for `jj split`Evan Mesterhazy committed 1 year ago2af5b60
  15. tests: resolve directory path to run_jj_in() relative to env_rootYuya Nishihara committed 1 year ago7fa8420
  16. tests: migrate unusual patterns of jj_cmd_ok() to run_jj_in()Yuya Nishihara committed 1 year agoad6985f
  17. tests: migrate non-snapshot users of jj_cmd_ok() to run_jj_in().success()Yuya Nishihara committed 1 year ago804d175
  18. tests: migrate snapshot users of jj_cmd_ok() to run_jj_in()Yuya Nishihara committed 1 year ago3193513
  19. tests: reorder comments and snapshots, split insta::allow_duplicates! { .. }Yuya Nishihara committed 1 year ago255532b
  20. tests: migrate snapshot users of jj_cmd_success() to run_jj_in()Yuya Nishihara committed 1 year agocdcc777
  21. tests: migrate callers of jj_cmd_failure() to run_jj_in()Yuya Nishihara committed 1 year agod19e58f
  22. tests: migrate some jj_cmd_success() output wrappers to run_jj_in()Yuya Nishihara committed 1 year agof1cd3a4
  23. cli: parse bookmark name to be created/updated as revset symbolYuya Nishihara committed 1 year agob1eca37
  24. tests: add [EOF] marker to command output when displayingYuya Nishihara committed 1 year ago630036e
  25. tests: add CommandOutputString wrapperYuya Nishihara committed 1 year agoa541652
  26. cli split: Move bookmarks to the first commit instead of the secondEvan Mesterhazy committed 1 year agoa4b064e
  27. cli split: Recommend `jj config set --user` instead of `--repo` in deprecation warningEvan Mesterhazy committed 1 year ago3799241
  28. cli split: Add a config option controlling how bookmarks move during splitsEvan Mesterhazy committed 1 year agod5d2164
  29. cli split: Move bookmark testing to a separate testEvan Mesterhazy committed 1 year agob2e2c79
  30. bookmarks: First step to make target revision a required argument to bookmark create/move/set.David Rieber committed 1 year agodd73b5a
  31. cli split: Test how the working copy commit changes across multiple workspacesEvan Mesterhazy committed 1 year ago915fe8f
  32. cli: fix interactive diff selection to not retain unmatched filesYuya Nishihara committed 1 year ago0d022f1
  33. cli: consider "JJ:" lines as comments also when not followed by spaceMartin von Zweigbergk committed 1 year ago7618b52
  34. split: do not prevent all changes from going into the first commitSamuel Tardieu committed 2 years agof38c59f
  35. split: do not reference file paths in warningSamuel Tardieu committed 2 years ago98c16c4