128 lines
5.5 KiB
Markdown
128 lines
5.5 KiB
Markdown
Let's look at how patch updates work.
|
|
|
|
Alice creates a project and Bob clones it.
|
|
|
|
``` ~alice
|
|
$ rad init --name heartwood --description "radicle heartwood protocol & stack" --no-confirm --public
|
|
|
|
Initializing public radicle 👾 project in .
|
|
|
|
✓ Project heartwood created.
|
|
|
|
Your project's Repository ID (RID) is rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK.
|
|
You can show it any time by running `rad .` from this directory.
|
|
|
|
✓ Project successfully announced.
|
|
|
|
Your project has been announced to the network and is now discoverable by peers.
|
|
To push changes, run `git push`.
|
|
```
|
|
|
|
``` ~bob
|
|
$ rad clone rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK
|
|
✓ Tracking relationship established for rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK with scope 'all'
|
|
✓ Fetching rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK from z6MknSL…StBU8Vi..
|
|
✓ Forking under z6Mkt67…v4N1tRk..
|
|
✓ Creating checkout in ./heartwood..
|
|
✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
|
|
✓ Remote-tracking branch alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master created for z6MknSL…StBU8Vi
|
|
✓ Repository successfully cloned under [..]/heartwood/
|
|
╭────────────────────────────────────╮
|
|
│ heartwood │
|
|
│ radicle heartwood protocol & stack │
|
|
│ 0 issues · 0 patches │
|
|
╰────────────────────────────────────╯
|
|
Run `cd ./heartwood` to go to the project directory.
|
|
```
|
|
|
|
We wait for Alice to sync our fork.
|
|
|
|
``` ~bob
|
|
$ rad node events -n 2 --timeout 1
|
|
{"type":"refsAnnounced","nid":"z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi","rid":"rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK","refs":[{"remote":"z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk","at":"161b775a3509c8098de67f57f750972bba015b31"}],"timestamp":[..]}
|
|
{"type":"refsSynced","remote":"z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi","rid":"rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK","at":"161b775a3509c8098de67f57f750972bba015b31"}
|
|
```
|
|
|
|
Bob then opens a patch.
|
|
|
|
``` ~bob (stderr)
|
|
$ cd heartwood
|
|
$ git checkout -b bob/feature -q
|
|
$ git commit --allow-empty -m "Bob's commit #1" -q
|
|
$ git push rad -o sync -o patch.message="Bob's patch" HEAD:refs/patches
|
|
✓ Patch 48c30356be83049458c0608d5a6f84789e9dc1d0 opened
|
|
✓ Synced with 1 node(s)
|
|
To rad://zhbMU4DUXrzB8xT6qAJh6yZ7bFMK/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
|
|
* [new reference] HEAD -> refs/patches
|
|
```
|
|
``` ~bob
|
|
$ git status --short --branch
|
|
## bob/feature...rad/patches/48c30356be83049458c0608d5a6f84789e9dc1d0
|
|
```
|
|
|
|
Alice checks it out.
|
|
|
|
``` ~alice
|
|
$ rad patch checkout 48c3035
|
|
✓ Switched to branch patch/48c3035
|
|
✓ Branch patch/48c3035 setup to track rad/patches/48c30356be83049458c0608d5a6f84789e9dc1d0
|
|
$ git show
|
|
commit bdcdb30b3c0f513620dd0f1c24ff8f4f71de956b
|
|
Author: radicle <radicle@localhost>
|
|
Date: Thu Dec 15 17:28:04 2022 +0000
|
|
|
|
Bob's commit #1
|
|
```
|
|
|
|
Bob then updates the patch.
|
|
|
|
``` ~bob (stderr)
|
|
$ git commit --allow-empty -m "Bob's commit #2" -q
|
|
$ git push rad -o sync -o patch.message="Updated."
|
|
✓ Patch 48c3035 updated to 8c15a61af45f561b4bf0694aee03ade34a1b18f5
|
|
✓ Synced with 1 node(s)
|
|
To rad://zhbMU4DUXrzB8xT6qAJh6yZ7bFMK/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
|
|
bdcdb30..cad2666 bob/feature -> patches/48c30356be83049458c0608d5a6f84789e9dc1d0
|
|
```
|
|
|
|
Alice pulls the update.
|
|
|
|
``` ~alice
|
|
$ rad patch show 48c3035
|
|
╭─────────────────────────────────────────────────────────────────────╮
|
|
│ Title Bob's patch │
|
|
│ Patch 48c30356be83049458c0608d5a6f84789e9dc1d0 │
|
|
│ Author bob z6Mkt67…v4N1tRk │
|
|
│ Head cad2666a8a2250e4dee175ed5044be2c251ff08b │
|
|
│ Commits ahead 2, behind 0 │
|
|
│ Status open │
|
|
├─────────────────────────────────────────────────────────────────────┤
|
|
│ cad2666 Bob's commit #2 │
|
|
│ bdcdb30 Bob's commit #1 │
|
|
├─────────────────────────────────────────────────────────────────────┤
|
|
│ ● opened by bob z6Mkt67…v4N1tRk now │
|
|
│ ↑ updated to 8c15a61af45f561b4bf0694aee03ade34a1b18f5 (cad2666) now │
|
|
╰─────────────────────────────────────────────────────────────────────╯
|
|
$ git ls-remote rad
|
|
f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/heads/master
|
|
cad2666a8a2250e4dee175ed5044be2c251ff08b refs/heads/patches/48c30356be83049458c0608d5a6f84789e9dc1d0
|
|
```
|
|
``` ~alice
|
|
$ git fetch rad
|
|
$ git status --short --branch
|
|
## patch/48c3035...rad/patches/48c30356be83049458c0608d5a6f84789e9dc1d0 [behind 1]
|
|
```
|
|
``` ~alice
|
|
$ git pull
|
|
Updating bdcdb30..cad2666
|
|
Fast-forward
|
|
```
|
|
``` ~alice
|
|
$ git show
|
|
commit cad2666a8a2250e4dee175ed5044be2c251ff08b
|
|
Author: radicle <radicle@localhost>
|
|
Date: Thu Dec 15 17:28:04 2022 +0000
|
|
|
|
Bob's commit #2
|
|
```
|