Github messages for voidlinux
 help / color / mirror / Atom feed
From: Duncaen <Duncaen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [RFC] sorted common/shlibs to avoid merge/rebase conflicts
Date: Mon, 05 Apr 2021 02:29:24 +0200	[thread overview]
Message-ID: <20210405002924.qQjz9eIS-VK6CbZe8bojnFAnJtjDz3dWXnHc6Qer-ik@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29965@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1815 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/issues/29965#issuecomment-813124670

Comment:
> > This is a better lint step (looking for duplicates) than failing on an unsorted list.
> 
> Is it easy to decide when a duplicate soname is ok or not?

If the package name is the same and it is the same as one of the edited templates or its sub packages could be a good first heuristic.
I don't think PRs should lint for things that are not related to the current package.

> > If someone forgets to sort it then we have 10 PRs all trying to reorder it,
> 
> Could we have a lint step checking that the file is sorted?

The problem is the lint step, forcing more things into the lint, especially things that don't belong to the PR in question just makes the changes larger and does not really help anyone.

> > affecting more lines than just adding a new soname in a random position instead of the end to avoid merge conflicts for newly added libraries.
> 
> Is there a policy about that? I understood sonames had to be placed at (near) the end of the file.

No, could be a "tip" instead of a policy, as it "might" reduce the work of the contributor, but it is not required. 

> The real pain for me was the experience of working with the branch in #29997, which has 7 commits for different packages which add sonames, and any rebase/editing of previous patches would cause a lot of pain. Of course, all this pain would mostly go away if I were to place each soname in a different random place in the file...

Right, its a good tip to mention, and people are doing it. Requiring a sorted file through a lint step is one work around with the mentioned downsides, randomly placing the additions is a simple workaround without any real downsides IMHO.

  parent reply	other threads:[~2021-04-05  0:29 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-03  2:03 [ISSUE] " gt7-void
2021-04-04 17:41 ` dkwo
2021-04-04 17:48 ` ericonr
2021-04-04 19:23 ` Duncaen
2021-04-04 19:24 ` Duncaen
2021-04-04 19:26 ` Duncaen
2021-04-04 19:26 ` Duncaen
2021-04-04 23:13 ` gt7-void
2021-04-04 23:17 ` gt7-void
2021-04-05  0:29 ` Duncaen
2021-04-05  0:29 ` Duncaen [this message]
2021-04-05  0:30 ` Duncaen
2022-05-17  2:14 ` github-actions
2022-06-01  2:14 ` [ISSUE] [CLOSED] " github-actions

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210405002924.qQjz9eIS-VK6CbZe8bojnFAnJtjDz3dWXnHc6Qer-ik@z \
    --to=duncaen@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).