unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Leo Famulari <leo@famulari.name>
To: Andreas Enge <andreas@enge.fr>
Cc: guix-devel@gnu.org
Subject: Re: core-updates merged!
Date: Wed, 3 Aug 2016 18:14:47 -0400	[thread overview]
Message-ID: <20160803221447.GA13977@jasmine> (raw)
In-Reply-To: <20160803212728.GB9172@solar>

On Wed, Aug 03, 2016 at 11:27:28PM +0200, Andreas Enge wrote:
> On Wed, Aug 03, 2016 at 05:01:29PM -0400, Leo Famulari wrote:
> > Do you mean `git checkout core-updates-next && git merge master`? That's
> > what I've done.
> 
> Another option would be the following:
> git checkout master
> git checkout -b core-updates
> git cherry-pick "commit 1 from core-updates-next"
> git cherry-pick "commit 2 from core-updates-next"
> ...
> 
> If there are only a dozen commits in core-updates-next, this could be
> feasible, with the danger of forgetting some.

I'm not sure if this is the right way to check, but

$ git log --oneline master..core-updates-next | wc -l
161

Does anyone else want to test this? I just tried to copy the master
branch and push it as TEMP-signature-test, and it was rejected by
Savannah. Although, I didn't get any detail from Savannah about why it
was rejected, which I did get when I tried to do it with
core-updates-next earlier. So perhaps there is some other issue now...

  reply	other threads:[~2016-08-03 22:15 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-01  8:19 Core-updates Andreas Enge
2016-08-01 21:48 ` core-updates merged! Ludovic Courtès
2016-08-02 13:26   ` ng0
2016-08-02 17:32     ` Ludovic Courtès
2016-08-02 17:48       ` Leo Famulari
2016-08-02 21:28         ` Ludovic Courtès
2016-08-03  4:04           ` Leo Famulari
2016-08-03 16:42             ` Ludovic Courtès
2016-08-03 17:24               ` Leo Famulari
2016-08-03 17:56                 ` Ludovic Courtès
2016-08-03 18:39                   ` Leo Famulari
2016-08-03 20:01                     ` Ludovic Courtès
2016-08-03 21:01                       ` Leo Famulari
2016-08-03 21:27                         ` Andreas Enge
2016-08-03 22:14                           ` Leo Famulari [this message]
2016-08-03 20:29                     ` ‘core-updates’ merge is a squashed commit Ludovic Courtès
2016-08-03 21:10                       ` Leo Famulari
2016-08-04  7:50                         ` Mark H Weaver
2016-08-04  8:24                           ` Andreas Enge
2016-08-04 12:36                             ` Mark H Weaver
2016-08-04 12:40                               ` Andreas Enge
2016-08-04 13:04                                 ` Leo Famulari
2016-08-04 13:23                                   ` Mark H Weaver
2016-08-04 14:07                                     ` Ludovic Courtès
2016-08-04 14:10                                     ` Andreas Enge
2016-08-04 14:45                                       ` Mathieu Lirzin
2016-08-04 16:37                                         ` Leo Famulari
2016-08-04 18:32                                           ` Andreas Enge
2016-08-04 20:06                                             ` Leo Famulari
2016-08-04 18:34                                         ` Andreas Enge
2016-08-04 15:06                               ` Andy Wingo
2016-08-04 16:44                                 ` Leo Famulari
2016-08-04 16:55                                   ` Andy Wingo
2016-08-04 20:05                                     ` Leo Famulari
2016-08-05  7:35                                       ` Andy Wingo
2016-08-05 14:59                                         ` Leo Famulari
2016-08-05 16:50                                           ` Andy Wingo
2016-08-05 17:11                                             ` Leo Famulari
2016-08-06  0:59                                               ` Mark H Weaver
2016-08-06  2:07                                                 ` Leo Famulari
2016-08-08  7:38                                                   ` Andy Wingo
2016-08-06  7:52                                                 ` Andreas Enge
2016-08-08  7:46                                                   ` Andy Wingo
2016-08-07  6:16                                 ` Mike Gerwitz
2016-08-04 11:41                           ` Leo Famulari
2016-08-06 14:42             ` core-updates merged! Leo Famulari
2016-08-10 19:49               ` Leo Famulari
2016-08-13  7:15                 ` Manolis Ragkousis
2016-08-13 23:20                   ` Core-updates is ready for your patches! Leo Famulari
2016-08-09  3:07           ` core-updates merged! Leo Famulari
  -- strict thread matches above, loose matches on Subject: below --
2020-05-08 19:47 Marius Bakke
2020-05-08 20:48 ` Jack Hill
2017-08-18 21:24 'core-updates' status Marius Bakke
2017-08-21 21:07 ` Marius Bakke
2017-08-25 18:34   ` Marius Bakke
2017-08-25 19:55     ` Leo Famulari
2017-08-26 12:04       ` Ludovic Courtès
2017-08-26 13:30         ` core-updates merged! Marius Bakke
2017-08-27 16:03           ` Ludovic Courtès
2015-02-10 16:38 Federico Beffa
2015-02-10 18:46 ` Andreas Enge
2015-02-10 18:50   ` John Darrington
2015-02-10 19:38   ` Federico Beffa
2015-01-05 16:51 core-updates, wip-armhf, and 0.8.1 Ludovic Courtès
2015-01-16 12:39 ` core-updates merged! Ludovic Courtès
2014-03-18 14:26 core-updates merge soon! Ludovic Courtès
2014-03-26 15:46 ` core-updates merged! Ludovic Courtès
2014-03-26 15:55   ` Thompson, David
2014-03-26 16:14     ` Ludovic Courtès
2014-03-26 17:28       ` Thompson, David
2014-03-27  9:37         ` Ludovic Courtès

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

  List information: https://guix.gnu.org/

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

  git send-email \
    --in-reply-to=20160803221447.GA13977@jasmine \
    --to=leo@famulari.name \
    --cc=andreas@enge.fr \
    --cc=guix-devel@gnu.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.
Code repositories for project(s) associated with this public inbox

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

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 read-only IMAP folder(s) and NNTP newsgroup(s).