mbox

[bug#46146,0/3] Add mdpo and dependencies

Message ID 20210127234237.31856-1-eu@euandre.org
Headers show

Message

King, Spencer via Guix-patches" via Jan. 27, 2021, 11:42 p.m. UTC 
Add the mdpo package, a xgettext-like tool for Markdown.

EuAndreh (3):
  gnu: Add md4c.
  gnu: Add python-pymd4c.
  gnu: Add mdpo.

 gnu/packages/gettext.scm    | 26 +++++++++++++++++++++++++-
 gnu/packages/markup.scm     | 23 +++++++++++++++++++++++
 gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++--
 3 files changed, 77 insertions(+), 3 deletions(-)

Comments

Nicolas Goaziou Feb. 2, 2021, 9:30 a.m. UTC | #1 
Hello,

guix-patches--- via <guix-patches@gnu.org> writes:

> Add the mdpo package, a xgettext-like tool for Markdown.

I fixed some merge conflicts (please avoid adding new packages at the
end of a file, unless it it is their "natural" place), updated mdpo to
0.3.6 and pushed.

Thank you.

Regards,
King, Spencer via Guix-patches" via Feb. 3, 2021, 12:06 p.m. UTC | #2 
> I fixed some merge conflicts (please avoid adding new packages at the
> end of a file, unless it it is their "natural" place), updated mdpo to
> 0.3.6 and pushed.

How can I best avoid this type of merge conflict in the future? Is
picking a random-ish position on the file a good solution?
Nicolas Goaziou Feb. 3, 2021, 12:27 p.m. UTC | #3 
Hello,

EuAndreh <eu@euandre.org> writes:

>> I fixed some merge conflicts (please avoid adding new packages at the
>> end of a file, unless it it is their "natural" place), updated mdpo to
>> 0.3.6 and pushed.
>
> How can I best avoid this type of merge conflict in the future? Is
> picking a random-ish position on the file a good solution?

Yes, that or alphabetically. It depends on the structure of the file.
Exception is packages inheriting from another package, which must be
located after the latter.

Regards,
King, Spencer via Guix-patches" via Feb. 3, 2021, 7:15 p.m. UTC | #4 
OK, thanks for the tip!

I'll adopt it on my next contribution :)