126 lines
7.3 KiB
Markdown
126 lines
7.3 KiB
Markdown
Back to being the project maintainer.
|
|
|
|
Changes have been proposed by another peer via a radicle patch. To track
|
|
changes from another peer, we must first follow them, and then create
|
|
a tracking branch in our working copy. The `rad remote add` command does all
|
|
of this.
|
|
|
|
```
|
|
$ rad remote add z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --name bob --sync --fetch
|
|
✓ Follow policy updated for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
|
|
✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk..
|
|
✓ Remote bob added
|
|
✓ Remote-tracking branch bob/master created for z6Mkt67…v4N1tRk
|
|
```
|
|
|
|
The contributor's changes are now visible to us.
|
|
|
|
```
|
|
$ rad inbox --sort-by id
|
|
╭──────────────────────────────────────────────────────────────────────╮
|
|
│ heartwood │
|
|
├──────────────────────────────────────────────────────────────────────┤
|
|
│ 1 ● issue flux capacitor underpowered d060989 opened now │
|
|
│ 2 ● patch Define power requirements a99d55e opened now │
|
|
╰──────────────────────────────────────────────────────────────────────╯
|
|
$ git branch -r
|
|
bob/patches/a99d55e5958a8c52ff7efbc8ff000d9bbdac79c7
|
|
rad/master
|
|
$ rad patch show a99d55e
|
|
╭─────────────────────────────────────────────────────────────────────╮
|
|
│ Title Define power requirements │
|
|
│ Patch a99d55e5958a8c52ff7efbc8ff000d9bbdac79c7 │
|
|
│ Author bob z6Mkt67…v4N1tRk │
|
|
│ Head 27857ec9eb04c69cacab516e8bf4b5fd36090f66 │
|
|
│ Commits ahead 2, behind 0 │
|
|
│ Status open │
|
|
│ │
|
|
│ See details. │
|
|
├─────────────────────────────────────────────────────────────────────┤
|
|
│ 27857ec Add README, just for the fun │
|
|
│ 3e674d1 Define power requirements │
|
|
├─────────────────────────────────────────────────────────────────────┤
|
|
│ ● opened by bob z6Mkt67…v4N1tRk (3e674d1) now │
|
|
│ ↑ updated to 25e7d77ed913ca07d06253988b73f392071d213d (27857ec) now │
|
|
╰─────────────────────────────────────────────────────────────────────╯
|
|
```
|
|
|
|
Wait! There's a mistake. The REQUIREMENTS should be a markdown file. Let's
|
|
quickly update the patch before incorporating the changes. Updating it this
|
|
way will tell others about the corrections we needed before merging the
|
|
changes.
|
|
|
|
```
|
|
$ rad patch checkout a99d55e5958a8c52ff7efbc8ff000d9bbdac79c7
|
|
✓ Switched to branch patch/a99d55e
|
|
✓ Branch patch/a99d55e setup to track rad/patches/a99d55e5958a8c52ff7efbc8ff000d9bbdac79c7
|
|
$ git mv REQUIREMENTS REQUIREMENTS.md
|
|
$ git commit -m "Use markdown for requirements"
|
|
[patch/a99d55e f567f69] Use markdown for requirements
|
|
1 file changed, 0 insertions(+), 0 deletions(-)
|
|
rename REQUIREMENTS => REQUIREMENTS.md (100%)
|
|
```
|
|
``` (stderr)
|
|
$ git push rad -o no-sync -o patch.message="Use markdown for requirements"
|
|
✓ Patch a99d55e updated to revision d094c1b78f004305b29dee6bd2fe32e2d6945438
|
|
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
|
|
* [new branch] patch/a99d55e -> patches/a99d55e5958a8c52ff7efbc8ff000d9bbdac79c7
|
|
```
|
|
|
|
Great, all fixed up, lets accept and merge the code.
|
|
|
|
```
|
|
$ rad patch review a99d55e --revision d094c1b --accept
|
|
✓ Patch a99d55e accepted
|
|
✓ Synced with 1 node(s)
|
|
$ git checkout master
|
|
Your branch is up to date with 'rad/master'.
|
|
$ git merge patch/a99d55e
|
|
Updating f2de534..f567f69
|
|
Fast-forward
|
|
README.md | 0
|
|
REQUIREMENTS.md | 0
|
|
2 files changed, 0 insertions(+), 0 deletions(-)
|
|
create mode 100644 README.md
|
|
create mode 100644 REQUIREMENTS.md
|
|
```
|
|
``` (stderr)
|
|
$ git push rad master
|
|
✓ Patch a99d55e5958a8c52ff7efbc8ff000d9bbdac79c7 merged at revision d094c1b
|
|
✓ Canonical head updated to f567f695d25b4e8fb63b5f5ad2a584529826e908
|
|
✓ Synced with 1 node(s)
|
|
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
|
|
f2de534..f567f69 master -> master
|
|
```
|
|
|
|
The patch is now merged and closed :).
|
|
|
|
```
|
|
$ rad patch show a99d55e
|
|
╭─────────────────────────────────────────────────────────────────────╮
|
|
│ Title Define power requirements │
|
|
│ Patch a99d55e5958a8c52ff7efbc8ff000d9bbdac79c7 │
|
|
│ Author bob z6Mkt67…v4N1tRk │
|
|
│ Head 27857ec9eb04c69cacab516e8bf4b5fd36090f66 │
|
|
│ Commits ahead 0, behind 1 │
|
|
│ Status merged │
|
|
│ │
|
|
│ See details. │
|
|
├─────────────────────────────────────────────────────────────────────┤
|
|
│ 27857ec Add README, just for the fun │
|
|
│ 3e674d1 Define power requirements │
|
|
├─────────────────────────────────────────────────────────────────────┤
|
|
│ ● opened by bob z6Mkt67…v4N1tRk (3e674d1) now │
|
|
│ ↑ updated to 25e7d77ed913ca07d06253988b73f392071d213d (27857ec) now │
|
|
│ * revised by alice (you) in d094c1b (f567f69) now │
|
|
│ └─ ✓ accepted by alice (you) now │
|
|
│ └─ ✓ merged by alice (you) at revision d094c1b (f567f69) now │
|
|
╰─────────────────────────────────────────────────────────────────────╯
|
|
```
|
|
|
|
To publish our new state to the network, we simply push:
|
|
|
|
```
|
|
$ git push
|
|
```
|