rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5 heartwood9fb4be044cfa68dee929c2ed370d3157e8977cf9Request message.radicle/native.yamlgit clone /var/lib/radicle/storage/z3gqcJUoA1n9HaHKufZs5FCSGazv5 /var/lib/radicle-ci/adapters/native/cia-native/21d2fb18-e915-48c7-a0a6-a7c5fde1e6e7/srcgit config advice.detachedHead falsegit checkout 9fb4be044cfa68dee929c2ed370d3157e8977cf9git show 9fb4be044cfa68dee929c2ed370d3157e8977cf9bash -c set -xeuo pipefail
export RUSTDOCFLAGS='-D warnings'
cargo --version
rustc --version
cargo fmt --check
cargo clippy --all-targets --workspace -- --deny warnings
cargo build --all-targets --workspace
cargo doc --workspace --no-deps --all-features
cargo test --workspace --no-fail-fast
Request message{
"request": "trigger",
"version": 1,
"event_type": "patch",
"repository": {
"id": "rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5",
"name": "heartwood",
"description": "Radicle Heartwood Protocol & Stack",
"private": false,
"default_branch": "master",
"delegates": [
"did:key:z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT",
"did:key:z6MktaNvN1KVFMkSRAiN4qK5yvX1zuEEaseeX5sffhzPZRZW",
"did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"did:key:z6MkgFq6z5fkF2hioLLSNu1zP2qEL1aHXHZzGH1FLFGAnBGz",
"did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz"
]
},
"action": "Updated",
"patch": {
"id": "528ccc6d665da76318342a2b4e842b87311b8d24",
"author": {
"id": "did:key:z6MkgXNuhPc3jNxADSfr954yn7fjuzeukeSVdzEpmGmJnmnK",
"alias": "12b-bdz-dev"
},
"title": "add a test to repoduce an issue with patch merging",
"state": {
"status": "open",
"conflicts": []
},
"before": "352c29c23ce2560750369aa50bc9f43bf3019d3f",
"after": "9fb4be044cfa68dee929c2ed370d3157e8977cf9",
"commits": [
"9fb4be044cfa68dee929c2ed370d3157e8977cf9",
"19cbadbdb640226644eefb165021817d917411c0",
"d42960742f877f3cc5fc2efe7973acdd2bcde903"
],
"target": "352c29c23ce2560750369aa50bc9f43bf3019d3f",
"labels": [],
"assignees": [],
"revisions": [
{
"id": "528ccc6d665da76318342a2b4e842b87311b8d24",
"author": {
"id": "did:key:z6MkgXNuhPc3jNxADSfr954yn7fjuzeukeSVdzEpmGmJnmnK",
"alias": "12b-bdz-dev"
},
"description": "This is to reproduce the issue discussed in https://radicle.zulipchat.com/#narrow/channel/369873-Support/topic/Merged.20patch.20still.20appears.20open.20and.20not.20merged/with/562986406",
"base": "352c29c23ce2560750369aa50bc9f43bf3019d3f",
"oid": "d42960742f877f3cc5fc2efe7973acdd2bcde903",
"timestamp": 1765400854
},
{
"id": "41d104a032319011f80f6f27ee64c9b66e255226",
"author": {
"id": "did:key:z6MkgXNuhPc3jNxADSfr954yn7fjuzeukeSVdzEpmGmJnmnK",
"alias": "12b-bdz-dev"
},
"description": "Add a `rad sync -i` step to check if the issue is caused by the identity document changes not being automatically announced.",
"base": "352c29c23ce2560750369aa50bc9f43bf3019d3f",
"oid": "a90f046d987c9d5ca2c098cef35da13bbbb33d27",
"timestamp": 1765454574
},
{
"id": "78f28e39258ea5a4363d315f37b1101d7047d982",
"author": {
"id": "did:key:z6MkgXNuhPc3jNxADSfr954yn7fjuzeukeSVdzEpmGmJnmnK",
"alias": "12b-bdz-dev"
},
"description": "Add a `rad sync -a` step to check if the issue is caused by the identity document changes not being automatically announced.",
"base": "352c29c23ce2560750369aa50bc9f43bf3019d3f",
"oid": "19cbadbdb640226644eefb165021817d917411c0",
"timestamp": 1765455318
},
{
"id": "389320b9c36b1543280266180d7fa9ee6b2f34a7",
"author": {
"id": "did:key:z6MkgXNuhPc3jNxADSfr954yn7fjuzeukeSVdzEpmGmJnmnK",
"alias": "12b-bdz-dev"
},
"description": "REVIEW: clean up test into one file\n\nSome additions:\n- bob checks the delegates\n- bob forks the repository so that `master` isn't new when they push",
"base": "352c29c23ce2560750369aa50bc9f43bf3019d3f",
"oid": "9fb4be044cfa68dee929c2ed370d3157e8977cf9",
"timestamp": 1765483299
}
]
}
}.radicle/native.yamlshell: | export RUSTDOCFLAGS='-D warnings' cargo --version rustc --version cargo fmt --check cargo clippy --all-targets --workspace -- --deny warnings cargo build --all-targets --workspace cargo doc --workspace --no-deps --all-features cargo test --workspace --no-fail-fast
git clone /var/lib/radicle/storage/z3gqcJUoA1n9HaHKufZs5FCSGazv5 /var/lib/radicle-ci/adapters/native/cia-native/21d2fb18-e915-48c7-a0a6-a7c5fde1e6e7/srcCommand arguments:
"git""clone""/var/lib/radicle/storage/z3gqcJUoA1n9HaHKufZs5FCSGazv5""/var/lib/radicle-ci/adapters/native/cia-native/21d2fb18-e915-48c7-a0a6-a7c5fde1e6e7/src"In directory: /run/radicle-ci-broker
Exit code: 0
Output (stdout and stderr):
Cloning into '/var/lib/radicle-ci/adapters/native/cia-native/21d2fb18-e915-48c7-a0a6-a7c5fde1e6e7/src'... done.
git config advice.detachedHead falseCommand arguments:
"git""config""advice.detachedHead""false"In directory: /var/lib/radicle-ci/adapters/native/cia-native/21d2fb18-e915-48c7-a0a6-a7c5fde1e6e7/src
Exit code: 0
git checkout 9fb4be044cfa68dee929c2ed370d3157e8977cf9Command arguments:
"git""checkout""9fb4be044cfa68dee929c2ed370d3157e8977cf9"In directory: /var/lib/radicle-ci/adapters/native/cia-native/21d2fb18-e915-48c7-a0a6-a7c5fde1e6e7/src
Exit code: 0
Output (stdout and stderr):
HEAD is now at 9fb4be044 REVIEW: clean up test into one file
git show 9fb4be044cfa68dee929c2ed370d3157e8977cf9Command arguments:
"git""show""9fb4be044cfa68dee929c2ed370d3157e8977cf9"In directory: /var/lib/radicle-ci/adapters/native/cia-native/21d2fb18-e915-48c7-a0a6-a7c5fde1e6e7/src
Exit code: 0
Output (stdout and stderr):
commit 9fb4be044cfa68dee929c2ed370d3157e8977cf9
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Thu Dec 11 19:58:40 2025 +0000
REVIEW: clean up test into one file
diff --git a/crates/radicle-cli/examples/unmerged-patch.md b/crates/radicle-cli/examples/unmerged-patch.md
new file mode 100644
index 000000000..e4a744eed
--- /dev/null
+++ b/crates/radicle-cli/examples/unmerged-patch.md
@@ -0,0 +1,215 @@
+DO NOT MERGE: This test scenario is in an attempt to reproduce a bug, currently it passes so it's not reproducing a bug :)
+
+Alice adds Bob as a delegate using their DID,
+`did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk`, (keeping threshold to `1`).
+
+``` ~alice
+$ rad id update --title "Add Bob" --description "Add Bob as a delegate" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+✓ Identity revision 7be665f9fccba97abb21b2fa85a6fd3181c72858 created
+╭────────────────────────────────────────────────────────────────────────╮
+│ Title Add Bob │
+│ Revision 7be665f9fccba97abb21b2fa85a6fd3181c72858 │
+│ Blob 93d3009787e5d8a481dffc4dd248ea46af592466 │
+│ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
+│ State accepted │
+│ Quorum yes │
+│ │
+│ Add Bob as a delegate │
+├────────────────────────────────────────────────────────────────────────┤
+│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
+╰────────────────────────────────────────────────────────────────────────╯
+
+@@ -1,13 +1,14 @@
+ {
+ "payload": {
+ "xyz.radicle.project": {
+ "defaultBranch": "master",
+ "description": "Radicle Heartwood Protocol & Stack",
+ "name": "heartwood"
+ }
+ },
+ "delegates": [
+- "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
++ "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
++ "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
+ ],
+ "threshold": 1
+ }
+```
+
+``` ~bob
+$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'all'
+Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+✓ Target met: 1 seed(s)
+✓ Creating checkout in ./heartwood..
+✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
+✓ Remote-tracking branch alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master created for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Repository successfully cloned under [..]/heartwood/
+╭────────────────────────────────────╮
+│ heartwood │
+│ Radicle Heartwood Protocol & Stack │
+│ 0 issues · 0 patches │
+╰────────────────────────────────────╯
+Run `cd ./heartwood` to go to the repository directory.
+```
+
+Note that alice should not need to follow bob, and then create
+a tracking branch in its working copy, using the `rad remote add`,
+because by default its policy scope is `all`
+
+Here Alice will create a patch, to latter be merged by Bob who has been added as delegate
+
+``` ~alice
+$ git checkout -b flux-capacitor-power
+$ touch REQUIREMENTS
+```
+
+Here the instructions are added to the project's `REQUIREMENTS` for 1.21
+gigawatts and committed with git.
+
+``` ~alice
+$ 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
+```
+
+Once the code is ready, we open a patch with our changes.
+
+``` ~alice (stderr)
+$ git push rad -o no-sync -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches
+✓ Patch df868fc7985fa7217aaef8423d73a077868c02b3 opened
+To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ * [new reference] HEAD -> refs/patches
+```
+
+It will now be listed as one of the project's open patches.
+
+``` ~alice
+$ rad patch
+╭─────────────────────────────────────────────────────────────────────────────────────────╮
+│ ● ID Title Author Reviews Head + - Updated │
+├─────────────────────────────────────────────────────────────────────────────────────────┤
+│ ● df868fc Define power requirements alice (you) - - 3e674d1 +0 -0 now │
+╰─────────────────────────────────────────────────────────────────────────────────────────╯
+$ rad patch show df868fc
+╭────────────────────────────────────────────────────╮
+│ Title Define power requirements │
+│ Patch df868fc7985fa7217aaef8423d73a077868c02b3 │
+│ Author alice (you) │
+│ Head 3e674d1a1df90807e934f9ae5da2591dd6848a33 │
+│ Base [.. ] │
+│ Branches flux-capacitor-power │
+│ Commits ahead 1, behind 0 │
+│ Status open │
+│ │
+│ See details. │
+├────────────────────────────────────────────────────┤
+│ 3e674d1 Define power requirements │
+├────────────────────────────────────────────────────┤
+│ ● Revision df868fc @ 3e674d1 by alice (you) now │
+╰────────────────────────────────────────────────────╯
+```
+
+We can also confirm that the patch branch is in storage:
+
+``` ~alice
+$ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi refs/heads/patches/*
+3e674d1a1df90807e934f9ae5da2591dd6848a33 refs/heads/patches/df868fc7985fa7217aaef8423d73a077868c02b3
+```
+
+Bob, who has just been added as a delegate will now merge the patch created by Alice
+
+``` ~bob
+$ cd heartwood
+$ rad fork
+✓ Forked repository rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+$ rad inspect --delegates
+did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
+did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
+$ rad sync -f
+Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+✓ Target met: 1 seed(s)
+🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+$ git branch -r
+ alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master
+ rad/master
+$ rad patch list --open
+╭───────────────────────────────────────────────────────────────────────────────────────────────────╮
+│ ● ID Title Author Reviews Head + - Updated │
+├───────────────────────────────────────────────────────────────────────────────────────────────────┤
+│ ● df868fc Define power requirements alice z6MknSL…StBU8Vi - - 3e674d1 +0 -0 now │
+╰───────────────────────────────────────────────────────────────────────────────────────────────────╯
+$ rad patch show df868fc
+╭───────────────────────────────────────────────────────────╮
+│ Title Define power requirements │
+│ Patch df868fc7985fa7217aaef8423d73a077868c02b3 │
+│ Author alice z6MknSL…StBU8Vi │
+│ Head 3e674d1a1df90807e934f9ae5da2591dd6848a33 │
+│ Base [.. ] │
+│ Commits ahead 1, behind 0 │
+│ Status open │
+│ │
+│ See details. │
+├───────────────────────────────────────────────────────────┤
+│ 3e674d1 Define power requirements │
+├───────────────────────────────────────────────────────────┤
+│ ● Revision df868fc @ 3e674d1 by alice z6MknSL…StBU8Vi now │
+╰───────────────────────────────────────────────────────────╯
+```
+
+``` ~bob
+$ rad patch checkout df868fc
+✓ Switched to branch patch/df868fc at revision df868fc
+✓ Branch patch/df868fc setup to track rad/patches/df868fc7985fa7217aaef8423d73a077868c02b3
+```
+
+bob accepts and merges the code.
+
+``` ~bob
+$ rad patch review df868fc --revision df868fc --accept
+✓ Patch df868fc accepted
+✓ Synced with 1 seed(s)
+$ git checkout master
+Your branch is up to date with 'rad/master'.
+$ git merge patch/df868fc
+Updating f2de534..3e674d1
+Fast-forward
+ REQUIREMENTS | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 REQUIREMENTS
+```
+``` ~bob (stderr)
+$ git push rad master
+✓ Patch df868fc7985fa7217aaef8423d73a077868c02b3 merged
+✓ Canonical reference refs/heads/master updated to target commit 3e674d1a1df90807e934f9ae5da2591dd6848a33
+✓ Synced with 1 seed(s)
+To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+ f2de534..3e674d1 master -> master
+```
+
+The patch is now merged and closed :).
+
+``` ~bob
+$ rad patch show df868fc
+╭───────────────────────────────────────────────────────────╮
+│ Title Define power requirements │
+│ Patch df868fc7985fa7217aaef8423d73a077868c02b3 │
+│ Author alice z6MknSL…StBU8Vi │
+│ Head 3e674d1a1df90807e934f9ae5da2591dd6848a33 │
+│ Base f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 │
+│ Branches master, patch/df868fc │
+│ Commits up to date │
+│ Status merged │
+│ │
+│ See details. │
+├───────────────────────────────────────────────────────────┤
+│ 3e674d1 Define power requirements │
+├───────────────────────────────────────────────────────────┤
+│ ● Revision df868fc @ 3e674d1 by alice z6MknSL…StBU8Vi now │
+│ └─ ✓ accepted by bob (you) now │
+│ └─ ✓ merged by bob (you) │
+╰───────────────────────────────────────────────────────────╯
+```
diff --git a/crates/radicle-cli/examples/workflow-2/1-new-project.md b/crates/radicle-cli/examples/workflow-2/1-new-project.md
deleted file mode 120000
index e2094cdd0..000000000
--- a/crates/radicle-cli/examples/workflow-2/1-new-project.md
+++ /dev/null
@@ -1 +0,0 @@
-../rad-init.md
\ No newline at end of file
diff --git a/crates/radicle-cli/examples/workflow-2/2-cloning.md b/crates/radicle-cli/examples/workflow-2/2-cloning.md
deleted file mode 120000
index 8e7337ecb..000000000
--- a/crates/radicle-cli/examples/workflow-2/2-cloning.md
+++ /dev/null
@@ -1 +0,0 @@
-../rad-clone.md
\ No newline at end of file
diff --git a/crates/radicle-cli/examples/workflow-2/3-delegate.md b/crates/radicle-cli/examples/workflow-2/3-delegate.md
deleted file mode 100644
index 76bc8150e..000000000
--- a/crates/radicle-cli/examples/workflow-2/3-delegate.md
+++ /dev/null
@@ -1,46 +0,0 @@
-Alice adds Bob as a delegate using their DID,
-`did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk`, (keeping threshold to `1`).
-
-```
-$ rad id update --title "Add Bob" --description "Add Bob as a delegate" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-✓ Identity revision 7be665f9fccba97abb21b2fa85a6fd3181c72858 created
-╭────────────────────────────────────────────────────────────────────────╮
-│ Title Add Bob │
-│ Revision 7be665f9fccba97abb21b2fa85a6fd3181c72858 │
-│ Blob 93d3009787e5d8a481dffc4dd248ea46af592466 │
-│ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
-│ State accepted │
-│ Quorum yes │
-│ │
-│ Add Bob as a delegate │
-├────────────────────────────────────────────────────────────────────────┤
-│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
-╰────────────────────────────────────────────────────────────────────────╯
-
-@@ -1,13 +1,14 @@
- {
- "payload": {
- "xyz.radicle.project": {
- "defaultBranch": "master",
- "description": "Radicle Heartwood Protocol & Stack",
- "name": "heartwood"
- }
- },
- "delegates": [
-- "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
-+ "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
-+ "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
- ],
- "threshold": 1
- }
-```
-
-Identity document changes might not be automatically announced. So we have to manually do it
-```
-$ rad sync -a
-✓ Synced with 1 seed(s)
-```
-
-Note that alice should not need to follow bob, and then create
-a tracking branch in its working copy, using the `rad remote add`,
-because by default its policy scope is `all`
diff --git a/crates/radicle-cli/examples/workflow-2/4-patch-create.md b/crates/radicle-cli/examples/workflow-2/4-patch-create.md
deleted file mode 100644
index 2918a3626..000000000
--- a/crates/radicle-cli/examples/workflow-2/4-patch-create.md
+++ /dev/null
@@ -1,61 +0,0 @@
-Here Alice will create a patch, to latter be merged by Bob who has been added as delegate
-
-```
-$ git checkout -b flux-capacitor-power
-$ touch REQUIREMENTS
-```
-
-Here the instructions are added to the project's `REQUIREMENTS` for 1.21
-gigawatts and committed with git.
-
-```
-$ git add REQUIREMENTS
-$ git commit -v -m "Define power requirements"
-[flux-capacitor-power 250d1e0] Define power requirements
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 heartwood/REQUIREMENTS
-```
-
-Once the code is ready, we open a patch with our changes.
-
-``` (stderr)
-$ git push rad -o no-sync -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches
-✓ Patch 19ebdb34e07740eeb6c12c6dcbc2a41ccca189aa opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new reference] HEAD -> refs/patches
-```
-
-It will now be listed as one of the project's open patches.
-
-```
-$ rad patch
-╭─────────────────────────────────────────────────────────────────────────────────────────╮
-│ ● ID Title Author Reviews Head + - Updated │
-├─────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● 19ebdb3 Define power requirements alice (you) - - 250d1e0 +0 -0 now │
-╰─────────────────────────────────────────────────────────────────────────────────────────╯
-$ rad patch show 19ebdb3
-╭────────────────────────────────────────────────────╮
-│ Title Define power requirements │
-│ Patch 19ebdb34e07740eeb6c12c6dcbc2a41ccca189aa │
-│ Author alice (you) │
-│ Head 250d1e07fe567ea34c8d90be75b367cb97a151da │
-│ Base [.. ] │
-│ Branches flux-capacitor-power │
-│ Commits ahead 1, behind 0 │
-│ Status open │
-│ │
-│ See details. │
-├────────────────────────────────────────────────────┤
-│ 250d1e0 Define power requirements │
-├────────────────────────────────────────────────────┤
-│ ● Revision 19ebdb3 @ 250d1e0 by alice (you) now │
-╰────────────────────────────────────────────────────╯
-```
-
-We can also confirm that the patch branch is in storage:
-
-```
-$ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi refs/heads/patches/*
-250d1e07fe567ea34c8d90be75b367cb97a151da refs/heads/patches/19ebdb34e07740eeb6c12c6dcbc2a41ccca189aa
-```
diff --git a/crates/radicle-cli/examples/workflow-2/5-patch-merge.md b/crates/radicle-cli/examples/workflow-2/5-patch-merge.md
deleted file mode 100644
index 1e9b876f6..000000000
--- a/crates/radicle-cli/examples/workflow-2/5-patch-merge.md
+++ /dev/null
@@ -1,88 +0,0 @@
-Bob, who has just been added as a delegate will now merge the patch created by Alice
-
-```
-$ rad sync -f
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
-✓ Target met: 1 seed(s)
-🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-$ git branch -r
- alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master
- rad/master
-$ rad patch list --open
-╭───────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ ● ID Title Author Reviews Head + - Updated │
-├───────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● 19ebdb3 Define power requirements alice z6MknSL…StBU8Vi - - 250d1e0 +0 -0 now │
-╰───────────────────────────────────────────────────────────────────────────────────────────────────╯
-$ rad patch show 19ebdb3
-╭───────────────────────────────────────────────────────────╮
-│ Title Define power requirements │
-│ Patch 19ebdb34e07740eeb6c12c6dcbc2a41ccca189aa │
-│ Author alice z6MknSL…StBU8Vi │
-│ Head 250d1e07fe567ea34c8d90be75b367cb97a151da │
-│ Base f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 │
-│ Commits ahead 1, behind 0 │
-│ Status open │
-│ │
-│ See details. │
-├───────────────────────────────────────────────────────────┤
-│ 250d1e0 Define power requirements │
-├───────────────────────────────────────────────────────────┤
-│ ● Revision 19ebdb3 @ 250d1e0 by alice z6MknSL…StBU8Vi now │
-╰───────────────────────────────────────────────────────────╯
-```
-
-```
-$ rad patch checkout 19ebdb3
-✓ Switched to branch patch/19ebdb3 at revision 19ebdb3
-✓ Branch patch/19ebdb3 setup to track rad/patches/19ebdb34e07740eeb6c12c6dcbc2a41ccca189aa
-```
-
-bob accepts and merges the code.
-
-```
-$ rad patch review 19ebdb3 --revision 19ebdb3 --accept
-✓ Patch 19ebdb3 accepted
-✓ Synced with 1 seed(s)
-$ git checkout master
-Your branch is up to date with 'rad/master'.
-$ git merge patch/19ebdb3
-Updating f2de534..250d1e0
-Fast-forward
- heartwood/REQUIREMENTS | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
- create mode 100644 heartwood/REQUIREMENTS
-```
-``` (stderr)
-$ git push rad master
-✓ Patch 19ebdb34e07740eeb6c12c6dcbc2a41ccca189aa merged at revision 250d1e0
-✓ Canonical reference refs/heads/master updated to target commit 250d1e07fe567ea34c8d90be75b367cb97a151da
-✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
- f2de534..250d1e0 master -> master
-```
-
-The patch is now merged and closed :).
-
-```
-$ rad patch show 19ebdb3
-╭───────────────────────────────────────────────────────────╮
-│ Title Define power requirements │
-│ Patch 19ebdb34e07740eeb6c12c6dcbc2a41ccca189aa │
-│ Author alice z6MknSL…StBU8Vi │
-│ Head 250d1e07fe567ea34c8d90be75b367cb97a151da │
-│ Base f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 │
-│ Commits ahead 1, behind 0 │
-│ Status merged │
-│ │
-│ See details. │
-├───────────────────────────────────────────────────────────┤
-│ 250d1e0 Define power requirements │
-├───────────────────────────────────────────────────────────┤
-│ ● Revision 19ebdb3 @ 250d1e0 by alice z6MknSL…StBU8Vi now │
-╰───────────────────────────────────────────────────────────╯
-```
-
-
-
-
diff --git a/crates/radicle-cli/tests/commands.rs b/crates/radicle-cli/tests/commands.rs
index e701c166c..b5c5dfab4 100644
--- a/crates/radicle-cli/tests/commands.rs
+++ b/crates/radicle-cli/tests/commands.rs
@@ -2618,6 +2618,43 @@ fn rad_patch_fetch_2() {
.unwrap();
}
+#[test]
+fn unmerged_patch() {
+ let mut environment = Environment::new();
+ let alice = environment.node("alice");
+ let bob = environment.node("bob");
+
+ environment.repository(&alice);
+
+ test(
+ "examples/rad-init.md",
+ environment.work(&alice),
+ Some(&alice.home),
+ [],
+ )
+ .unwrap();
+
+ let alice = alice.spawn();
+ let mut bob = bob.spawn();
+
+ bob.connect(&alice).converge([&alice]);
+
+ formula(&environment.tempdir(), "examples/unmerged-patch.md")
+ .unwrap()
+ .home(
+ "alice",
+ environment.work(&alice),
+ [("RAD_HOME", alice.home.path().display())],
+ )
+ .home(
+ "bob",
+ environment.work(&bob),
+ [("RAD_HOME", bob.home.path().display())],
+ )
+ .run()
+ .unwrap();
+}
+
#[test]
fn git_push_and_fetch() {
let mut environment = Environment::new();
@@ -2817,46 +2854,3 @@ fn rad_workflow() {
)
.unwrap();
}
-
-#[test]
-fn rad_workflow_2() {
- let mut environment = Environment::new();
- let alice = environment.node("alice");
- let bob = environment.node("bob");
-
- environment.repository(&alice);
-
- environment.test("workflow-2/1-new-project", &alice).unwrap();
-
- let alice = alice.spawn();
- let mut bob = bob.spawn();
-
- bob.connect(&alice).converge([&alice]);
-
- environment.test("workflow-2/2-cloning", &bob).unwrap();
-
- test(
- "examples/workflow-2/3-delegate.md",
- environment.work(&alice).join("heartwood"),
- Some(&alice.home),
- [],
- )
- .unwrap();
-
- test(
- "examples/workflow-2/4-patch-create.md",
- environment.work(&alice).join("heartwood"),
- Some(&alice.home),
- [],
- )
- .unwrap();
-
- test(
- "examples/workflow-2/5-patch-merge.md",
- environment.work(&bob).join("heartwood"),
- Some(&bob.home),
- [],
- )
- .unwrap();
-
-}
bash -c set -xeuo pipefail
export RUSTDOCFLAGS='-D warnings'
cargo --version
rustc --version
cargo fmt --check
cargo clippy --all-targets --workspace -- --deny warnings
cargo build --all-targets --workspace
cargo doc --workspace --no-deps --all-features
cargo test --workspace --no-fail-fast
Command arguments:
"bash""-c""set -xeuo pipefail\nexport RUSTDOCFLAGS='-D warnings'\n\ncargo --version\nrustc --version\n\ncargo fmt --check\ncargo clippy --all-targets --workspace -- --deny warnings\ncargo build --all-targets --workspace\ncargo doc --workspace --no-deps --all-features\ncargo test --workspace --no-fail-fast\n"In directory: /var/lib/radicle-ci/adapters/native/cia-native/21d2fb18-e915-48c7-a0a6-a7c5fde1e6e7/src
Exit code: 127
Output (stdout and stderr):
+ export 'RUSTDOCFLAGS=-D warnings' + RUSTDOCFLAGS='-D warnings' + cargo --version bash: line 4: cargo: command not found