ok/jj
1
0
Fork 0
forked from mirrors/jj

demos: add more jj log calls to the working-copy demo

Thanks to @arxanas for the suggestion.
This commit is contained in:
Martin von Zweigbergk 2021-10-27 20:38:56 -07:00
parent 4f8632519b
commit 98337e819d
2 changed files with 12 additions and 9 deletions

View file

@ -42,8 +42,8 @@ Features:
changes (you can even check out a different commit while resolving merge
conflicts).
<a href="https://asciinema.org/a/uu2yF0FzPiRigbYQYok2PHmX5" target="_blank">
<img src="https://asciinema.org/a/uu2yF0FzPiRigbYQYok2PHmX5.svg" />
<a href="https://asciinema.org/a/zWMv4ffmoXykBtrxvDY6ohEaZ" target="_blank">
<img src="https://asciinema.org/a/zWMv4ffmoXykBtrxvDY6ohEaZ.svg" />
</a>
* **Operations update the repo first, then possibly the working copy**

View file

@ -10,11 +10,10 @@ cd Hello-World
run_demo 'The working copy is automatically committed' '
run_command "# We are in the octocat/Hello-World repo."
run_command "# We have an empty working copy on top of master:"
run_command "jj log"
pause 5
run_command "jj status"
pause 2
run_command ""
run_command "jj log"
pause 5
run_command "# Now make some changes in the working copy:"
run_command "echo \"Goodbye World!\" > README"
run_command "echo stuff > new-file"
@ -22,21 +21,24 @@ run_command ""
run_command "# Our working copy'\''s commit ID changed"
run_command "# because we made changes:"
run_command "jj status"
pause 2
run_command "jj log"
pause 5
run_command ""
run_command "# Add a branch so we can easily refer to this"
run_command "# commit:"
run_command "jj branch goodbye"
pause 2
run_command ""
run_command "jj log"
pause 3
run_command "# Start working on a new change off of master:"
run_command "jj co master"
pause 2
run_command ""
run_command "jj log"
pause 3
run_command "# Note that the working copy is now clean; the"
run_command "# \"goodbye\" change stayed in its own commit:"
run_command "jj status"
pause 5
pause 2
run_command ""
run_command "# Modify a file in this new change:"
run_command "echo \"Hello everyone!\" > README"
@ -47,6 +49,7 @@ run_command "# example, set the description of any commit."
run_command "# First, set it on the working copy:"
run_command "jj describe -m everyone"
pause 2
run_command ""
run_command "# Now set it on the change we worked on before:"
run_command "jj describe goodbye -m goodbye"
pause 2