all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Marius Bakke <marius@gnu.org>
To: Pierre Neidhardt <mail@ambrevar.xyz>
Cc: guix-devel@gnu.org
Subject: Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3.
Date: Sun, 08 Nov 2020 16:16:40 +0100	[thread overview]
Message-ID: <87tutzg9pj.fsf@gnu.org> (raw)
In-Reply-To: <87lffcyynb.fsf@ambrevar.xyz>

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

Pierre Neidhardt <mail@ambrevar.xyz> writes:

> Hi Marius!
>
> Sorry about this! :(
>
>> If you happen to be around right now, can you confirm that there were no
>> changes to nyxt inputs in 573489fbcd68e3a89cc5c9c66693d3689b1b88bf?
>
> I don't have a Guix checkout at hand now so I can only tell you tomorrow.
> Did you manage to fix the merge conflict?

The merge was resolved in 32787d652460871a79f99b63230f92759e2e0de2.

> Otherwise go ahead and I'll fix the Nyxt recipe when you are done.

Great.  I verified that Nyxt builds on 'staging', but have not tried
running it.

> Out of curiosity: how do commit messages help you here?

It can be difficult to tell from the diff alone which inputs are native,
regular, or propagated.

Often when merging, I need to look at the conflicting commits multiple
times.  Having to deduce the changes every time carries a mental
overhead that is eliminated when I can compare the diff against the
commit message.

In this particular case I ended up writing down the changes for each
conflicting Nyxt commit (21e792, c5d9cd, 573489).  The latter was
especially tricky because it changed the indentation, but ultimately I
found that it had no input changes (by comparing line-for-line).

> Is there an automated way to report the inputs changes from the
> comment message?

I'm not sure what you mean, can you elaborate?

> Sorry for the troubles!

No worries.  :-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]

  reply	other threads:[~2020-11-08 15:17 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20201020130843.10939.42161@vcs0.savannah.gnu.org>
2020-11-07 19:39 ` branch master updated: gnu: nyxt: Update to 2-pre-release-3 Marius Bakke
2020-11-07 19:46   ` Marius Bakke
2020-11-08  9:40     ` Pierre Neidhardt
2020-11-08 15:16       ` Marius Bakke [this message]
2020-11-09  7:12         ` zimoun
2020-11-09  9:29           ` Pierre Neidhardt
2020-11-09 21:14             ` Marius Bakke
2020-11-09 22:38               ` Marius Bakke
2020-11-10  9:01                 ` Pierre Neidhardt
2020-11-10  9:28                   ` Pierre Neidhardt
2020-11-10 19:22                   ` Marius Bakke
2020-11-10 19:59                     ` Pierre Neidhardt
2020-11-10 20:28                       ` Marius Bakke
2020-11-11  9:19                         ` Pierre Neidhardt
2020-11-11 12:43                           ` Pierre Neidhardt

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=87tutzg9pj.fsf@gnu.org \
    --to=marius@gnu.org \
    --cc=guix-devel@gnu.org \
    --cc=mail@ambrevar.xyz \
    /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.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.