Radish alpha
h
heartwood
rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5
Radicle Heartwood Protocol & Stack
Radicle
Git
.. framework git workflow jj-config.md jj-init-bare.md jj-init-colocate.md rad-auth-errors.md rad-auth.md rad-block.md rad-checkout-repo-config-linux.md rad-checkout-repo-config-macos.md rad-checkout.md rad-clean.md rad-clone-all.md rad-clone-bare.md rad-clone-connect.md rad-clone-directory.md rad-clone-partial-fail.md rad-clone-scope.md rad-clone-unknown.md rad-clone.md rad-cob-log.md rad-cob-migrate.md rad-cob-multiset rad-cob-multiset.md rad-cob-operations.md rad-cob-show.md rad-cob-update-identity.md rad-cob-update.md rad-config.md rad-diff.md rad-fetch.md rad-fork.md rad-help.md rad-id-collaboration.md rad-id-conflict.md rad-id-multi-delegate.md rad-id-private.md rad-id-threshold-soft-fork.md rad-id-threshold.md rad-id-unauthorized-delegate.md rad-id-unknown-field.md rad-id-update-delete-field.md rad-id.md rad-inbox.md rad-init-detached-head.md rad-init-existing-bare.md rad-init-existing.md rad-init-no-git.md rad-init-no-seed.md rad-init-private-clone-seed.md rad-init-private-clone.md rad-init-private-no-seed.md rad-init-private-seed.md rad-init-private.md rad-init-sync-not-connected.md rad-init-sync-preferred.md rad-init-sync-timeout.md rad-init-sync.md rad-init-with-existing-remote.md rad-init.md rad-inspect-noauth.md rad-inspect.md rad-issue-list.md rad-issue.md rad-key-mismatch.md rad-merge-after-update.md rad-merge-no-ff.md rad-merge-via-push.md rad-node.md rad-patch-ahead-behind.md rad-patch-change-base.md rad-patch-checkout-force.md rad-patch-checkout-revision.md rad-patch-checkout.md rad-patch-delete.md rad-patch-detached-head.md rad-patch-diff.md rad-patch-draft.md rad-patch-edit.md rad-patch-fetch-1.md rad-patch-fetch-2.md rad-patch-jj.md rad-patch-merge-draft.md rad-patch-open-explore.md rad-patch-pull-update.md rad-patch-revert-merge.md rad-patch-update.md rad-patch-via-push.md rad-patch.md rad-publish.md rad-push-and-pull-patches.md rad-remote.md rad-review-by-hunk.md rad-seed-and-follow.md rad-seed-many.md rad-seed-policy-allow-no-scope.md rad-seed-scope.md rad-self.md rad-sync-without-node.md rad-sync.md rad-unseed-many.md rad-unseed.md rad-warn-old-nodes.md rad-watch.md
heartwood › crates › radicle-cli › examples › rad-patch-change-base.md

Sometimes we are a bit forgetful and miss a detail when creating a patch. In this case we’ll stack two patches by creating one after the other.

First we add a REQUIREMENTS file:

$ git checkout -b flux-capacitor-power
$ touch REQUIREMENTS
$ git add REQUIREMENTS
$ git commit -v -m "Define power requirements"
[flux-capacitor-power 3e674d1] Define power requirements
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 REQUIREMENTS

$ git push rad flux-capacitor-power
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
 * [new branch]      flux-capacitor-power -> flux-capacitor-power
$ git push rad -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches
✓ Patch aa45913e757cacd46972733bddee5472c78fa32a opened
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
 * [new reference]   HEAD -> refs/patches

And then a README file:

$ git checkout -b add-readme
$ touch README.md
$ git add README.md
$ git commit --message "Add README, just for the fun"
[add-readme 27857ec] Add README, just for the fun
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 README.md

$ git push rad -o patch.message="Add README, just for the fun" HEAD:refs/patches
✓ Patch 183d343ab47d7fe18baf1b24b7209ad033d7fe5c opened
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
 * [new reference]   HEAD -> refs/patches

Our second patch looks like the following:

$ rad patch show 183d343ab47d7fe18baf1b24b7209ad033d7fe5c
╭──────────────────────────────────────────────────────────╮
│ Title     Add README, just for the fun                   │
│ Patch     183d343ab47d7fe18baf1b24b7209ad033d7fe5c       │
│ Author    alice (you)                                    │
│ Head      27857ec9eb04c69cacab516e8bf4b5fd36090f66       │
│ Base      f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354       │
│ Branches  add-readme                                     │
│ Commits   ahead 2, behind 0                              │
│ Status    open                                           │
├──────────────────────────────────────────────────────────┤
│ 27857ec Add README, just for the fun                     │
│ 3e674d1 Define power requirements                        │
├──────────────────────────────────────────────────────────┤
│ ● Revision 183d343 @ f2de534..27857ec by alice (you) now │
╰──────────────────────────────────────────────────────────╯

But wait, we meant to stack them and so we don’t want to see the commit 3e674d1 as part of this patch, so we create a new revision with a new base:

$ rad patch update 183d343 -b 3e674d1 -m "Whoops, forgot to set the base" --no-announce
ebe76f9c2148eb595d7a745f82275786bf3458c3

Now, if we show the patch we can see the patch’s base has changed and we have a single commit:

$ rad patch show 183d343
╭──────────────────────────────────────────────────────────╮
│ Title     Add README, just for the fun                   │
│ Patch     183d343ab47d7fe18baf1b24b7209ad033d7fe5c       │
│ Author    alice (you)                                    │
│ Head      27857ec9eb04c69cacab516e8bf4b5fd36090f66       │
│ Base      3e674d1a1df90807e934f9ae5da2591dd6848a33       │
│ Branches  add-readme                                     │
│ Commits   ahead 2, behind 0                              │
│ Status    open                                           │
├──────────────────────────────────────────────────────────┤
│ 27857ec Add README, just for the fun                     │
├──────────────────────────────────────────────────────────┤
│ ● Revision 183d343 @ f2de534..27857ec by alice (you) now │
│ ↑ Revision ebe76f9 @ 3e674d1..27857ec by alice (you) now │
╰──────────────────────────────────────────────────────────╯

Sometimes we are a bit forgetful and miss a detail when creating a
patch. In this case we'll stack two patches by creating one after the
other.

First we add a `REQUIREMENTS` file:

```
$ git checkout -b flux-capacitor-power
$ touch REQUIREMENTS
$ git add REQUIREMENTS
$ git commit -v -m "Define power requirements"
[flux-capacitor-power 3e674d1] Define power requirements
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 REQUIREMENTS
```
``` (stderr)
$ git push rad flux-capacitor-power
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
 * [new branch]      flux-capacitor-power -> flux-capacitor-power
$ git push rad -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches
✓ Patch aa45913e757cacd46972733bddee5472c78fa32a opened
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
 * [new reference]   HEAD -> refs/patches
```

And then a `README` file:
```
$ git checkout -b add-readme
$ touch README.md
$ git add README.md
$ git commit --message "Add README, just for the fun"
[add-readme 27857ec] Add README, just for the fun
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 README.md
```
``` (stderr)
$ git push rad -o patch.message="Add README, just for the fun" HEAD:refs/patches
✓ Patch 183d343ab47d7fe18baf1b24b7209ad033d7fe5c opened
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
 * [new reference]   HEAD -> refs/patches
```

Our second patch looks like the following:

```
$ rad patch show 183d343ab47d7fe18baf1b24b7209ad033d7fe5c
╭──────────────────────────────────────────────────────────╮
│ Title     Add README, just for the fun                   │
│ Patch     183d343ab47d7fe18baf1b24b7209ad033d7fe5c       │
│ Author    alice (you)                                    │
│ Head      27857ec9eb04c69cacab516e8bf4b5fd36090f66       │
│ Base      f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354       │
│ Branches  add-readme                                     │
│ Commits   ahead 2, behind 0                              │
│ Status    open                                           │
├──────────────────────────────────────────────────────────┤
│ 27857ec Add README, just for the fun                     │
│ 3e674d1 Define power requirements                        │
├──────────────────────────────────────────────────────────┤
│ ● Revision 183d343 @ f2de534..27857ec by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```

But wait, we meant to stack them and so we don't want to see the
commit `3e674d1` as part of this patch, so we create a new revision
with a new `base`:

```
$ rad patch update 183d343 -b 3e674d1 -m "Whoops, forgot to set the base" --no-announce
ebe76f9c2148eb595d7a745f82275786bf3458c3
```

Now, if we show the patch we can see the patch's base has changed and
we have a single commit:

```
$ rad patch show 183d343
╭──────────────────────────────────────────────────────────╮
│ Title     Add README, just for the fun                   │
│ Patch     183d343ab47d7fe18baf1b24b7209ad033d7fe5c       │
│ Author    alice (you)                                    │
│ Head      27857ec9eb04c69cacab516e8bf4b5fd36090f66       │
│ Base      3e674d1a1df90807e934f9ae5da2591dd6848a33       │
│ Branches  add-readme                                     │
│ Commits   ahead 2, behind 0                              │
│ Status    open                                           │
├──────────────────────────────────────────────────────────┤
│ 27857ec Add README, just for the fun                     │
├──────────────────────────────────────────────────────────┤
│ ● Revision 183d343 @ f2de534..27857ec by alice (you) now │
│ ↑ Revision ebe76f9 @ 3e674d1..27857ec by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```