martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-08-16 09:10:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

demos: add some blank lines to separate groups of commands (and comments)

Browse Source
This commit is contained in:
Martin von Zweigbergk 2021-10-27 16:35:48 -07:00
parent 3981cd90f8
commit 571336b827
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
demos/demo_operation_log.sh
View File

@ -27,6 +27,7 @@ run_command "jj describe -m stuff"
pause 2
run_command "jj rebase -d test"
pause 2
run_command ""
run_command "# We are now going to make another change off of"
run_command "# master:"
run_command "jj co master"
@ -44,6 +45,7 @@ expect -re "o ..34m(.*?)..0m "
set rebase_op $expect_out(1,string)
expect_prompt
pause 7
run_command ""
run_command "# Let'\''s undo that rebase operation:"
run_command "jj undo -o $rebase_op"
pause 3
@ -58,6 +60,7 @@ pause 5
run_command "# Looks nice, let'\''s go back to that point:"
run_command "jj op restore -o $rebase_op"
pause 2
run_command ""
run_command "# We'\''re now back to before the \"other stuff\""
run_command "# change existed:"
run_command "jj log"

7
demos/demo_resolve_conflict.sh
View File

@ -18,12 +18,15 @@ 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 3
@ -35,17 +38,21 @@ 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 diff of the conflict resolution looks"
run_command "# like this:"
run_command "jj diff"
pause 5
run_command ""
run_command "# We now squash the conflict resolution into"
run_command "# the conflicted parent change:"
run_command "jj squash"
pause 2
run_command ""
run_command "# Looks good now:"
run_command "jj log"
pause 3

8
demos/demo_working_copy.sh
View File

@ -14,27 +14,34 @@ run_command "jj log"
pause 5
run_command "jj status"
pause 2
run_command ""
run_command "# Now make some changes in the working copy:"
run_command "echo \"Goodbye World!\" > README"
run_command "echo stuff > new-file"
run_command ""
run_command "# Our working copy'\''s commit ID changed"
run_command "# because we made changes:"
run_command "jj status"
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 "# Start working on a new change off of master:"
run_command "jj co master"
pause 2
run_command ""
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
run_command ""
run_command "# Modify a file in this new change:"
run_command "echo \"Hello everyone!\" > README"
pause 2
run_command ""
run_command "# The working copy is not special; we can, for"
run_command "# example, set the description of any commit."
run_command "# First, set it on the working copy:"
@ -43,6 +50,7 @@ pause 2
run_command "# Now set it on the change we worked on before:"
run_command "jj describe goodbye -m goodbye"
pause 2
run_command ""
run_command "# Inspect the result:"
run_command "jj log"
'