all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* btrfs-progs updated to 4.8.2 twice
@ 2016-10-28  2:17 Leo Famulari
  2016-10-30 21:47 ` Ludovic Courtès
  0 siblings, 1 reply; 3+ messages in thread
From: Leo Famulari @ 2016-10-28  2:17 UTC (permalink / raw)
  To: guix-devel

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

I noticed that btrfs-progs was updated to 4.8.2 on core-updates twice.

Commited to core-updates:
http://git.savannah.gnu.org/cgit/guix.git/commit/?h=core-updates&id=f02fb6dd6b6dbf91c3497a086bab5d9e791b2468

Commited on master and then merged into core-updates:
http://git.savannah.gnu.org/cgit/guix.git/commit/?h=core-updates&id=6270769dc216fc6a2f54ca77d3090e3e610ade1c

I've experienced similar shenanigans while testing my own merges. I
wonder if there is anything we can do to avoid this?

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: btrfs-progs updated to 4.8.2 twice
  2016-10-28  2:17 btrfs-progs updated to 4.8.2 twice Leo Famulari
@ 2016-10-30 21:47 ` Ludovic Courtès
  2016-10-31 17:56   ` Leo Famulari
  0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2016-10-30 21:47 UTC (permalink / raw)
  To: Leo Famulari; +Cc: guix-devel

Leo Famulari <leo@famulari.name> skribis:

> I noticed that btrfs-progs was updated to 4.8.2 on core-updates twice.
>
> Commited to core-updates:
> http://git.savannah.gnu.org/cgit/guix.git/commit/?h=core-updates&id=f02fb6dd6b6dbf91c3497a086bab5d9e791b2468
>
> Commited on master and then merged into core-updates:
> http://git.savannah.gnu.org/cgit/guix.git/commit/?h=core-updates&id=6270769dc216fc6a2f54ca77d3090e3e610ade1c
>
> I've experienced similar shenanigans while testing my own merges. I
> wonder if there is anything we can do to avoid this?

Is it a problem?  I mean did ‘git merge’ trigger a conflict?  I would
expect it to automatically notice that it’s the same change.

Ludo’.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: btrfs-progs updated to 4.8.2 twice
  2016-10-30 21:47 ` Ludovic Courtès
@ 2016-10-31 17:56   ` Leo Famulari
  0 siblings, 0 replies; 3+ messages in thread
From: Leo Famulari @ 2016-10-31 17:56 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: guix-devel

On Sun, Oct 30, 2016 at 10:47:36PM +0100, Ludovic Courtès wrote:
> Leo Famulari <leo@famulari.name> skribis:
> 
> > I noticed that btrfs-progs was updated to 4.8.2 on core-updates twice.
> >
> > Commited to core-updates:
> > http://git.savannah.gnu.org/cgit/guix.git/commit/?h=core-updates&id=f02fb6dd6b6dbf91c3497a086bab5d9e791b2468
> >
> > Commited on master and then merged into core-updates:
> > http://git.savannah.gnu.org/cgit/guix.git/commit/?h=core-updates&id=6270769dc216fc6a2f54ca77d3090e3e610ade1c
> >
> > I've experienced similar shenanigans while testing my own merges. I
> > wonder if there is anything we can do to avoid this?
> 
> Is it a problem?  I mean did ‘git merge’ trigger a conflict?  I would
> expect it to automatically notice that it’s the same change.

I didn't do this merge so I'm not sure if Git presented a conflict to
the user.

In this case, it's not really a problem. But it makes me wonder what
we've missed...

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-10-31 17:56 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-28  2:17 btrfs-progs updated to 4.8.2 twice Leo Famulari
2016-10-30 21:47 ` Ludovic Courtès
2016-10-31 17:56   ` Leo Famulari

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.