116 lines
6.4 KiB
Markdown
116 lines
6.4 KiB
Markdown
Back to being the project maintainer.
|
|
|
|
Changes have been proposed by another person (or peer) via a radicle patch. To follow changes by another, we must 'track' them.
|
|
|
|
```
|
|
$ rad track did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --alias bob
|
|
✓ Tracking policy updated for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
|
|
$ rad sync --fetch
|
|
✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk..
|
|
✓ Fetched repository from 1 seed(s)
|
|
```
|
|
|
|
Additionally, we need to add a new 'git remote' to our working copy for the
|
|
peer. Upcoming versions of radicle will not require this step.
|
|
|
|
```
|
|
$ rad remote add z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --name bob
|
|
✓ Remote bob added with rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
|
|
```
|
|
|
|
``` (stderr)
|
|
$ git fetch bob
|
|
From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
|
|
* [new branch] flux-capacitor-power -> bob/flux-capacitor-power
|
|
* [new branch] master -> bob/master
|
|
```
|
|
|
|
The contributor's changes are now visible to us.
|
|
|
|
```
|
|
$ git branch -r
|
|
bob/flux-capacitor-power
|
|
bob/master
|
|
rad/master
|
|
$ rad patch show 5f0a547
|
|
╭───────────────────────────────────────────────────────────────────────────────────╮
|
|
│ Title Define power requirements │
|
|
│ Patch 5f0a547f7a91bf002bb0542035a647fd5af134a5 │
|
|
│ Author did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk │
|
|
│ Head 27857ec9eb04c69cacab516e8bf4b5fd36090f66 │
|
|
│ Commits ahead 2, behind 0 │
|
|
│ Status open │
|
|
│ │
|
|
│ See details. │
|
|
├───────────────────────────────────────────────────────────────────────────────────┤
|
|
│ ● opened by did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk [ ... ] │
|
|
│ ↑ updated to b7e2356fb7e3981980b42603eea969851d17a40d (27857ec) [ ... ] │
|
|
╰───────────────────────────────────────────────────────────────────────────────────╯
|
|
```
|
|
|
|
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.
|
|
|
|
```
|
|
$ git checkout flux-capacitor-power
|
|
branch 'flux-capacitor-power' set up to track 'bob/flux-capacitor-power'.
|
|
$ git mv REQUIREMENTS REQUIREMENTS.md
|
|
$ git commit --fixup HEAD~
|
|
[flux-capacitor-power f6484e0] fixup! Define power requirements
|
|
1 file changed, 0 insertions(+), 0 deletions(-)
|
|
rename REQUIREMENTS => REQUIREMENTS.md (100%)
|
|
$ rad patch update --message "Define power requirements" --message "See details." 5f0a547f7a91bf002bb0542035a647fd5af134a5
|
|
Updating 27857ec -> f6484e0
|
|
1 commit(s) ahead, 0 commit(s) behind
|
|
✓ Patch updated to revision 4486280d0dec743d6a1a0c05754f8e40426c681d
|
|
```
|
|
|
|
Great, all fixed up, lets merge the code.
|
|
|
|
```
|
|
$ git checkout master
|
|
Your branch is up to date with 'rad/master'.
|
|
$ rad merge 4486280d0dec743d6a1a0c05754f8e40426c681d
|
|
Merging 5f0a547 R2 (f6484e0) by z6Mkt67…v4N1tRk into master (f2de534) via fast-forward...
|
|
Running `git merge --ff-only f6484e0f43e48a8983b9b39bf9bd4cd889f1d520`...
|
|
Updating f2de534..f6484e0
|
|
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
|
|
✓ Updated master f2de534 -> f6484e0 via fast-forward
|
|
✓ Patch state updated, use `git push rad` to publish
|
|
```
|
|
|
|
The patch is now merged and closed :).
|
|
|
|
```
|
|
$ rad patch show 5f0a547
|
|
╭─────────────────────────────────────────────────────────────────────────────────────────╮
|
|
│ Title Define power requirements │
|
|
│ Patch 5f0a547f7a91bf002bb0542035a647fd5af134a5 │
|
|
│ Author did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk │
|
|
│ Head f6484e0f43e48a8983b9b39bf9bd4cd889f1d520 │
|
|
│ Branches flux-capacitor-power, master │
|
|
│ Commits ahead 3, behind 0 │
|
|
│ Status merged │
|
|
│ │
|
|
│ See details. │
|
|
├─────────────────────────────────────────────────────────────────────────────────────────┤
|
|
│ ● opened by did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk [ ... ] │
|
|
│ ↑ updated to b7e2356fb7e3981980b42603eea969851d17a40d (27857ec) [ ... ] │
|
|
│ ↑ updated to 4486280d0dec743d6a1a0c05754f8e40426c681d (f6484e0) [ ... ] │
|
|
│ ✓ merged by did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (you) [ ... ] │
|
|
╰─────────────────────────────────────────────────────────────────────────────────────────╯
|
|
```
|
|
|
|
To publish our new state to the network, we simply push:
|
|
|
|
```
|
|
$ git push
|
|
```
|