[bug#40764] New package: r-restrserve

[Oleg Pykhalov]

Hello,

zimoun <zimon.toutoune@gmail.com> writes:

[…]

> The option “format-patch --base” reduces the burden and I proposed this
> patch:
>
>    <http://issues.guix.gnu.org/issue/43946>
>
> Adding directly in the patch the (base) commit where the patch is known
> to apply fixes most of the issues.  IMO.

It adds ‘base-commit’ and optionally ‘prerequisite-patch-id’ (see [1]), which 
will
help you to checkout base-commit and apply a patch, but still you will
need to rebase on origin/master with solving conflicts AFAIK.

Also, on git version 2.29.2 --base requires an argument.  If we apply
the patch on 43946 issue, we should mention this in example.  

And, IMHO, the --base flag should be mention inside the first paragraph
of [2], where format-patch is recommended for patch submission.
Otherwise people will send with and without --base, which probably
will not hurt, but still.

[1]: --base=HEAD~~ output example
--8<---------------cut here---------------start------------->8---
oleg@guixsd ~/src/guix-master$ git format-patch --base=HEAD~~ --stdout 
HEAD~..HEAD
From ea50795d7f54582d5c439f60e836ff2ee5d8aed2 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Sat, 12 Dec 2020 00:39:26 -0500
Subject: [PATCH] gnu: linux-libre 4.4: Update to 4.4.248.

* gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.248.
(linux-libre-4.4-pristine-source): Update hash.
---
 gnu/packages/linux.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 4c5917bc59..73dec7d1b7 100644
[…]


base-commit: 4c327e025277dd59b864200d5ecf671b5656e7c9
prerequisite-patch-id: 2f8bef97c220d126e922b526c4fccc847592311d
-- 
2.29.2

--8<---------------cut here---------------end--------------->8---

[2] https://guix.gnu.org/manual/en/html_node/Submitting-Patches.html

signature.asc
Description: PGP signature