[bug#40764] New package: r-restrserve

[zimoun]

Hi Ricardo,

On Thu, 10 Dec 2020 at 14:18, Ricardo Wurmus <rekado@elephly.net> wrote:
>> On Wed, 09 Dec 2020 at 19:36, Christopher Baines <mail@cbaines.net> wrote:
>>
>>> In the future, I'd strongly recommend not adding packages to the bottom
>>> of modules, unless you really want the package definition to be
>>> there. If every new definition gets added at the bottom, merge conflicts
>>> become very likely. Related to this, I also moved the package definition
>>> up off the bottom of the module.
>>
>> What do you mean?  From my understanding, we always add new R packages
>> at the botton of the files cran.scm or bioconductor.scm; mainly.
>
> The problem is 100% with tooling.  Git needs some context to apply
> patches.  When you add package definitions to the bottom and that bottom
> context keeps changing you will always need to tell Git how to apply that
> patch.

[...]

> It would be *great* if we could find another way to appease git and do
> the right thing for the most common case of simply adding a package
> definition to the bottom of the file, no matter what context there might
> be right above.

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.


All the best,
simon