mirror of
https://github.com/jj-vcs/jj.git
synced 2025-12-23 06:01:01 +00:00
3ac3685876
Since the last update, `-d` has been renamed to `-o/--onto`, the local backend has been renamed to the simple backend, and colocation is enabled by default.
59 lines
1.7 KiB
Bash
Executable file
59 lines
1.7 KiB
Bash
Executable file
#!/bin/bash
|
|
set -euo pipefail
|
|
. "$(dirname "$0")"/helpers.sh
|
|
|
|
new_tmp_dir
|
|
{
|
|
jj git clone https://github.com/octocat/Hello-World
|
|
cd Hello-World
|
|
jj abandon --ignore-immutable octocat-patch-1@origin
|
|
jj bookmark forget octocat-patch-1
|
|
jj bookmark track test@origin
|
|
} > /dev/null 2>&1
|
|
|
|
comment "We are in the octocat/Hello-World repo.
|
|
The \"operation log\" shows the operations
|
|
so far:"
|
|
run_command "jj op log"
|
|
|
|
comment "We are going to make some changes to show
|
|
how the operation log works. Let's add a file, set
|
|
a description, and rebase onto the \"test\" bookmark:"
|
|
run_command "echo stuff > new-file"
|
|
run_command "jj describe -m stuff"
|
|
run_command "jj rebase --onto test"
|
|
|
|
comment "We are now going to make another change off of
|
|
master:"
|
|
run_command "jj new master"
|
|
run_command "jj describe -m \"other stuff\""
|
|
|
|
comment "The repo now looks like this:"
|
|
run_command "jj log"
|
|
comment "The most recent portion of the operation log
|
|
is:"
|
|
run_command_allow_broken_pipe "jj op log --limit 4"
|
|
|
|
comment "Let's revert that rebase operation:"
|
|
rebase_op=$(jj --color=never op log --no-graph -T 'id.short(5)' --limit 1 --at-op @--)
|
|
run_command "jj op revert $rebase_op"
|
|
|
|
comment "Note that only the rebase was reverted, and the
|
|
subsequent \"other stuff\" change was not reverted:"
|
|
run_command "jj log"
|
|
|
|
comment "We can also see what the repo looked like
|
|
after the rebase operation:"
|
|
run_command "jj --at-op $rebase_op log"
|
|
|
|
comment "Let's say we instead want to go back to the
|
|
state of the repo right after the rebase:"
|
|
run_command "jj op restore $rebase_op"
|
|
|
|
# TODO: Explain and demo that revert and restore are also recorded? Remove demo
|
|
# of --at-op?
|
|
comment "We're now back to before the \"other stuff\"
|
|
change existed:"
|
|
run_command "jj log"
|
|
|
|
blank
|