From 98337e819dd4113dd7bcfd9c318c9986dc243edb Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Wed, 27 Oct 2021 20:38:56 -0700 Subject: [PATCH] demos: add more `jj log` calls to the working-copy demo Thanks to @arxanas for the suggestion. --- README.md | 4 ++-- demos/demo_working_copy.sh | 17 ++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 3824b0c12..4f264997d 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,8 @@ Features: changes (you can even check out a different commit while resolving merge conflicts). - - + + * **Operations update the repo first, then possibly the working copy** diff --git a/demos/demo_working_copy.sh b/demos/demo_working_copy.sh index f12502bcc..30f391dc3 100755 --- a/demos/demo_working_copy.sh +++ b/demos/demo_working_copy.sh @@ -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