mirror of
https://github.com/martinvonz/jj.git
synced 2024-11-29 02:54:04 +00:00
71c789f50b
The default log output of showing all commits is not very useful when contributing to an existing repo. Let's have it default to showing commits not on any remote branch instead. I think that's the best we can do since we don't have a configurable main branch yet, and we don't even have per-repo configuration.. Closes #250.
50 lines
1.4 KiB
Bash
Executable file
50 lines
1.4 KiB
Bash
Executable file
#!/bin/bash
|
|
set -euo pipefail
|
|
. "$(dirname "$0")"/demo_helpers.sh
|
|
parse_args "$@"
|
|
|
|
new_tmp_dir
|
|
jj git clone https://github.com/octocat/Hello-World
|
|
cd Hello-World
|
|
|
|
run_demo 'Basic conflict resolution flow' '
|
|
run_command "# We are on the master branch of the"
|
|
run_command "# octocat/Hello-World repo:"
|
|
run_command "jj log -r '\''all()'\''"
|
|
pause 7
|
|
run_command "# Let'\''s make an edit that will conflict"
|
|
run_command "# when we rebase it:"
|
|
run_command "jj describe -m \"README: say which world\""
|
|
run_command "echo \"Hello Earth!\" > README"
|
|
run_command "jj diff"
|
|
pause 2
|
|
run_command ""
|
|
run_command "# We'\''re going to rebase it onto commit b1."
|
|
run_command "# That commit looks like this:"
|
|
run_command "jj diff -r b1"
|
|
pause 2
|
|
run_command ""
|
|
run_command "# Now rebase:"
|
|
run_command "jj rebase -d b1"
|
|
run_command ""
|
|
run_command "# Huh, that seemed to succeed. Let'\''s take a"
|
|
run_command "# look at the repo:"
|
|
pause 2
|
|
run_command "jj log -r '\''all()'\''"
|
|
pause 4
|
|
run_command "jj status"
|
|
pause 3
|
|
run_command "# As you can see, the rebased commit has a"
|
|
run_command "# conflict. The file in the working copy looks"
|
|
run_command "# like this:"
|
|
run_command "cat README"
|
|
pause 5
|
|
run_command ""
|
|
run_command "# Now we will resolve the conflict:"
|
|
run_command "echo \"Hello earth!\" > README"
|
|
pause 2
|
|
run_command ""
|
|
run_command "# The status command no longer reports it:"
|
|
run_command "jj status"
|
|
pause 2
|
|
'
|