Github messages for voidlinux
 help / color / mirror / Atom feed
* [ISSUE] [RFC] sorted common/shlibs to avoid merge/rebase conflicts
@ 2021-04-03  2:03 gt7-void
  2021-04-04 17:41 ` dkwo
                   ` (12 more replies)
  0 siblings, 13 replies; 14+ messages in thread
From: gt7-void @ 2021-04-03  2:03 UTC (permalink / raw)
  To: ml

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

New issue by gt7-void on void-packages repository

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

Description:
The way new entries are added to `common/shlibs` (generally at the end) often results in merge conflicts (e.g. all PR for new packages that are open at a given time are incompatible since they all append at the same position).

It occurs to me that a way to minimize those conflicts would be to have `common/shlibs` be sorted by soname. In this way it becomes very unlikely that two commits conflict (they will only if they are lexicographically next to each other).

In addition, this would help to be explicit about repeated sonames and remove unnecessary duplicates.

This may be a little bit painful at the time the list is sorted, but then it's just a matter to keep it sorted (maybe some hook can check and complain about unsorted entries?).

The same applies to `common/options.description`, although that file is not updated so often, OTOH it's almost sorted (only 6 entries out of order).

A possible sort order would be to use:
```
$ sort common/shlibs -sk1,1
```
and
```
$ sort common/options.description -sk1,1 -t=
```

To see the kinds of soname repetitions:
```
$ sort common/shlibs -sk1,1 | awk '$1=="#" { next } $1==k&&first{print first; first="";d++} $1==k{print;x++} $1!=k{k=$1;first=$0;t++} END{print t, d, x}'
...
3866 61 92
```
I.e. out of 3866 different sonames, there are 61 repeated (61+92 times in total).

^ permalink raw reply	[flat|nested] 14+ messages in thread
end of thread, other threads:[~2022-06-01  2:14 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-03  2:03 [ISSUE] [RFC] sorted common/shlibs to avoid merge/rebase conflicts 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
2021-04-05  0:30 ` Duncaen
2022-05-17  2:14 ` github-actions
2022-06-01  2:14 ` [ISSUE] [CLOSED] " github-actions

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).