modified radicle-cli/examples/rad-cob.md
@@ -45,7 +45,7 @@ $ rad patch
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -55,17 +55,17 @@ Both issue and patch COBs can be listed.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -92,13 +92,13 @@ date Thu, 15 Dec 2022 17:28:04 +0000
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -119,3 +119,48 @@ date Thu, 15 Dec 2022 17:28:04 +0000
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
modified radicle-cli/examples/rad-id.md
@@ -94,10 +94,10 @@ $ rad inspect --identity
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -108,9 +108,9 @@ date Thu, 15 Dec 2022 17:28:04 +0000
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-merge-after-update.md
@@ -4,7 +4,7 @@ Let's start by creating a patch.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -27,8 +27,8 @@ update it, we expect it to be updated and merged:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
modified radicle-cli/examples/rad-merge-no-ff.md
@@ -4,7 +4,7 @@ First, let's create a patch.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -36,7 +36,7 @@ committer radicle <radicle@localhost> 1671125284 +0000
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-merge-via-push.md
@@ -4,7 +4,7 @@ Let's start by creating two patches.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -12,7 +12,7 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -22,8 +22,8 @@ This creates some remote tracking branches for us:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -36,13 +36,13 @@ z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -61,8 +61,8 @@ When we push to `rad/master`, we automatically merge the patches:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -75,10 +75,10 @@ $ rad patch --merged
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -88,7 +88,7 @@ $ rad patch show 8357a9f1d61e80309d314491aa754969d9f47d77
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -109,8 +109,8 @@ z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-patch-ahead-behind.md
@@ -37,7 +37,7 @@ $ git log --graph --decorate --abbrev-commit --pretty=oneline --all
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -48,17 +48,17 @@ $ rad patch list
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -93,7 +93,7 @@ $ git checkout -q -b feature/2 feature/1
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -101,10 +101,10 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -124,7 +124,7 @@ If we want to instead create a "stacked" patch, we can do so with the
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -136,10 +136,10 @@ However, since the patch is still intended to be merged into `master`, we see
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-patch-change-base.md
@@ -18,7 +18,7 @@ $ git push rad flux-capacitor-power
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -35,7 +35,7 @@ $ git commit --message "Add README, just for the fun"
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -43,10 +43,10 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -66,18 +66,18 @@ commit `3e674d1` as part of this patch, so we create a new revision
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -88,6 +88,6 @@ $ rad patch show 11188b8 -v
|
|
|
|
|
|
| - | |
| + | |
|
|
|
modified radicle-cli/examples/rad-patch-checkout-force.md
@@ -13,7 +13,7 @@ $ git commit -v -m "Define power requirements"
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -26,9 +26,9 @@ $ cd heartwood
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -45,10 +45,10 @@ $ git commit --message "Add README, just for the fun"
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -56,13 +56,13 @@ Bob fetches these new changes and can see their branch is now behind:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -74,17 +74,17 @@ overwrite any changes. Bob can choose to use the `--force` (`-f`) flag to
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-patch-checkout-revision.md
@@ -5,7 +5,7 @@ So first, let's add another change to the patch and a `LICENSE` file.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -14,13 +14,13 @@ $ git push rad -o patch.message="Add LICENSE, just for the business"
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -31,16 +31,16 @@ $ rad patch show 6ff4f09
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-patch-checkout.md
@@ -22,7 +22,7 @@ Once the code is ready, we open (or create) a patch with our changes for the pro
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -30,9 +30,9 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -40,8 +40,8 @@ as long as we haven't made changes to it.
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -50,7 +50,7 @@ Now, let's add a README too!
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -59,7 +59,7 @@ We can now finish off the update:
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
modified radicle-cli/examples/rad-patch-diff.md
@@ -10,7 +10,7 @@ $ git commit -m "Add README" -q
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -31,7 +31,7 @@ $ git commit --amend -q
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -52,7 +52,7 @@ Buf if we only want to see the changes from the first revision, we can do that
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-patch-draft.md
@@ -9,7 +9,7 @@ To open a patch in draft mode, we use the `--draft` option:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -17,10 +17,10 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -36,14 +36,14 @@ $ rad patch show 193a2540ded82245b49971de8afc89a129502c6d
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -60,11 +60,11 @@ If for whatever reason, it needed to go back into draft mode, we could use
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-patch-edit.md
@@ -16,7 +16,7 @@ $ git commit --message "Add README, just for the fun"
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -32,18 +32,18 @@ $ git commit -v -m "Define the LICENSE"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -54,7 +54,7 @@ $ rad patch show 0631b2d
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -62,11 +62,11 @@ We can change the title and description of the patch itself by using a
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -79,7 +79,7 @@ $ rad patch show 0631b2d
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -90,11 +90,11 @@ If we want to change a specific revision's description, we can use the
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -107,7 +107,7 @@ $ rad patch show 0631b2d
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-patch-fetch-2.md
@@ -12,7 +12,7 @@ $ git push rad -o patch.message="Changes" HEAD:refs/patches
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -23,5 +23,5 @@ $ git pull
|
|
|
|
|
|
| - | |
| + | |
|
modified radicle-cli/examples/rad-patch-merge-draft.md
@@ -4,7 +4,7 @@ Let's start by creating a draft patch.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -13,7 +13,7 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-patch-open-explore.md
@@ -4,10 +4,10 @@ When preferred seeds are configured, opening a patch outputs the patch URL.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -18,13 +18,13 @@ If we update the patch, the URL is also output.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -33,7 +33,7 @@ While simply pushing a commit outputs a URL to the new source tree.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-patch-pull-update.md
@@ -53,22 +53,22 @@ Bob then opens a patch.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -82,19 +82,19 @@ Bob then updates the patch.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -104,16 +104,16 @@ $ rad patch show 48c3035
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-patch-update.md
@@ -6,16 +6,16 @@ $ git commit -q -m "Not a real change" --allow-empty
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -46,17 +46,17 @@ Now, instead of using `git push` to update the patch, as we normally would,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -67,6 +67,6 @@ $ rad patch show 8f5dcedc07a89928fd450bce1479f2559bcfd1d4
|
|
|
|
|
|
| - | |
| + | |
|
|
|
modified radicle-cli/examples/rad-patch-via-push.md
@@ -8,8 +8,8 @@ $ git checkout -b feature/1
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -19,10 +19,10 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -42,7 +42,7 @@ branch associated with this patch:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -50,7 +50,7 @@ Let's check that it's up to date with our local head:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -62,14 +62,14 @@ $ git show-ref
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -78,7 +78,7 @@ We can create another patch:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -87,8 +87,8 @@ We see both branches with upstreams now:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -99,8 +99,8 @@ $ rad patch
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -112,9 +112,9 @@ $ git commit -a -m "Improve code" -q --allow-empty
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -132,10 +132,10 @@ This allows for pushing to the remote patch branch without using the full
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -146,7 +146,7 @@ $ rad patch show b77b2e8
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -159,14 +159,14 @@ $ git rev-parse HEAD
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -187,7 +187,7 @@ Now let's push to the patch head.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -200,18 +200,18 @@ use `--force` to force the update.
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -222,8 +222,8 @@ $ rad patch show b77b2e8
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-patch.md
@@ -26,7 +26,7 @@ Once the code is ready, we open (or create) a patch with our changes for the pro
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -38,14 +38,14 @@ $ rad patch
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -78,14 +78,14 @@ $ rad patch list --authored
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -93,12 +93,12 @@ We can also label patches as well as assign DIDs to the patch to help
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -126,49 +126,49 @@ $ git commit --message "Add README, just for the fun"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -178,7 +178,7 @@ $ rad patch show 6ff4f09
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -186,15 +186,15 @@ $ rad patch show 6ff4f09
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -204,7 +204,7 @@ $ rad patch show 6ff4f09
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-push-and-pull-patches.md
@@ -12,9 +12,9 @@ $ git checkout -b alice/1 -q
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -23,19 +23,19 @@ $ rad remote add z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -47,27 +47,27 @@ $ git push
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-review-by-hunk.md
@@ -61,7 +61,7 @@ $ git commit -q -m "Update files"
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -70,7 +70,7 @@ Finally, we do a review of the patch by hunk. The output of this command should
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -116,8 +116,8 @@ rename to notes/INSTRUCTIONS.txt
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -127,8 +127,8 @@ index 7937fb3..0000000
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -138,8 +138,8 @@ index 0000000..2b5bd86
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -153,8 +153,8 @@ index 867958c..3af9741 100644
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -169,8 +169,8 @@ index 4e2e828..3af9741 100644
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -178,7 +178,7 @@ rename to notes/INSTRUCTIONS.txt
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
modified radicle-cli/examples/workflow/4-patching-contributor.md
@@ -26,7 +26,7 @@ Once the code is ready, we open a patch with our changes.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -38,12 +38,12 @@ $ rad patch
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -62,7 +62,7 @@ We can also confirm that the patch branch is in storage:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -77,15 +77,15 @@ $ git commit --message "Add README, just for the fun"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
modified radicle-cli/examples/workflow/5-patching-maintainer.md
@@ -17,12 +17,12 @@ The contributor's changes are now visible to us.
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -34,7 +34,7 @@ $ rad patch show 3581e83
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -44,31 +44,31 @@ way will tell others about the corrections we needed before merging the
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -79,7 +79,7 @@ Fast-forward
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -89,10 +89,10 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -104,10 +104,10 @@ $ rad patch show 3581e83
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/src/commands/cob.rs
@@ -136,15 +136,18 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cob/src/backend/git/change.rs
@@ -13,6 +13,7 @@ use radicle_git_ext::commit::trailers::OwnedTrailer;
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -77,6 +78,8 @@ pub mod error {
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -95,7 +98,7 @@ impl change::Storage for git2::Repository {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -118,9 +121,9 @@ impl change::Storage for git2::Repository {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -128,12 +131,14 @@ impl change::Storage for git2::Repository {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -142,7 +147,8 @@ impl change::Storage for git2::Repository {
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -160,11 +166,23 @@ impl change::Storage for git2::Repository {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -175,6 +193,9 @@ impl change::Storage for git2::Repository {
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -184,7 +205,8 @@ impl change::Storage for git2::Repository {
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -193,19 +215,20 @@ impl change::Storage for git2::Repository {
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -260,7 +283,7 @@ fn write_commit(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cob/src/change/store.rs
@@ -22,7 +22,7 @@ pub trait Storage {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -71,8 +71,10 @@ pub struct Entry<Resource, Id, Signature> {
|
|
|
|
|
|
| - | |
| + | |
|
|
| + | |
| + | |
|
|
|
|
|
modified radicle-cob/src/change_graph.rs
@@ -50,9 +50,7 @@ impl ChangeGraph {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -76,7 +74,7 @@ impl ChangeGraph {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -158,32 +156,26 @@ impl Default for GraphBuilder {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cob/src/object/collaboration/create.rs
@@ -57,7 +57,7 @@ pub fn create<T, S, G>(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -69,7 +69,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cob/src/object/collaboration/list.rs
@@ -22,23 +22,23 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cob/src/object/collaboration/update.rs
@@ -59,7 +59,7 @@ pub fn update<T, S, G>(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -88,7 +88,7 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cob/src/trailers.rs
@@ -17,29 +17,40 @@ pub mod error {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -47,31 +58,31 @@ impl TryFrom<&OwnedTrailer> for ResourceCommitTrailer {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
modified radicle-httpd/src/api/v1/projects.rs
@@ -2503,7 +2503,7 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2806,7 +2806,7 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3353,7 +3353,7 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-httpd/src/test.rs
@@ -39,7 +39,7 @@ pub const SESSION_ID: &str = "u9MGAkkfkMOv0uDDB2WeUHBT7HbsO2Dy";
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle/src/cob/op.rs
@@ -38,6 +38,8 @@ pub struct Op<A> {
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -71,6 +73,7 @@ impl<A> Op<A> {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -97,7 +100,8 @@ impl From<Entry> for Op<Vec<u8>> {
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -130,6 +134,7 @@ where
|
|
|
|
|
|
| + | |
|
|
|
|
|
modified radicle/src/cob/store.rs
@@ -147,13 +147,13 @@ where
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle/src/cob/test.rs
@@ -78,6 +78,7 @@ where
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -113,6 +114,7 @@ where
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -181,12 +183,14 @@ impl<G: Signer> Actor<G> {
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| + | |
|
|
|
|
|