mirror of
https://seed.radicle.dev/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5.git
synced 2026-11-08 21:00:44 +08:00
cloudhead
a46bcb2247
Previously, COB change commits would not distinguish between their parents. This means that they would try to load source code commits (eg. for patch COBs) and then fail since those commits wouldn't have a manifest or `Rad-Resource`. We introduce a backwards compatible change here which is that parent oids that are not COB commits are accompanied by a commit trailer called `Rad-Related`. This is for all related content that should be pulled in but is not part of the change graph proper. When building the change graph, we simply ignore commits that are marked as "related".
94 lines
4.9 KiB
Markdown
94 lines
4.9 KiB
Markdown
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 0f3cd0b3a69c8f70bfa2d3366122c07704e5bb5f 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 3c3036d038ef50cccb9dbccb46302bf0867ba683 opened
|
|
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
|
|
* [new reference] HEAD -> refs/patches
|
|
```
|
|
|
|
Our second patch looks like the following:
|
|
|
|
```
|
|
$ rad patch show 3c3036d -v
|
|
╭────────────────────────────────────────────────────╮
|
|
│ Title Add README, just for the fun │
|
|
│ Patch 3c3036d038ef50cccb9dbccb46302bf0867ba683 │
|
|
│ Author z6MknSL…StBU8Vi (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 │
|
|
├────────────────────────────────────────────────────┤
|
|
│ ● opened by z6MknSL…StBU8Vi (you) (27857ec) 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 3c3036d -b 3e674d1 -m "Whoops, forgot to set the base" --no-announce
|
|
d94313559de9009d261135736a3c5f3f3e873b5d
|
|
```
|
|
|
|
Now, if we show the patch we can see the patch's base has changed and
|
|
we have a single commit:
|
|
|
|
```
|
|
$ rad patch show 3c3036d -v
|
|
╭─────────────────────────────────────────────────────────────────────╮
|
|
│ Title Add README, just for the fun │
|
|
│ Patch 3c3036d038ef50cccb9dbccb46302bf0867ba683 │
|
|
│ Author z6MknSL…StBU8Vi (you) │
|
|
│ Head 27857ec9eb04c69cacab516e8bf4b5fd36090f66 │
|
|
│ Base 3e674d1a1df90807e934f9ae5da2591dd6848a33 │
|
|
│ Branches add-readme │
|
|
│ Commits ahead 2, behind 0 │
|
|
│ Status open │
|
|
├─────────────────────────────────────────────────────────────────────┤
|
|
│ 27857ec Add README, just for the fun │
|
|
├─────────────────────────────────────────────────────────────────────┤
|
|
│ ● opened by z6MknSL…StBU8Vi (you) (27857ec) now │
|
|
│ ↑ updated to d94313559de9009d261135736a3c5f3f3e873b5d (27857ec) now │
|
|
╰─────────────────────────────────────────────────────────────────────╯
|
|
```
|