all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Ricardo Wurmus <rekado@elephly.net>
To: zimoun <zimon.toutoune@gmail.com>
Cc: Guix Devel <guix-devel@gnu.org>
Subject: Re: Updating to latest Bioconductor release
Date: Thu, 19 Nov 2020 22:13:33 +0100	[thread overview]
Message-ID: <873615aw3m.fsf@elephly.net> (raw)
In-Reply-To: <CAJ3okZ0Wdv7yntAYX1cX-=3zLbytYv=Ui1nCukrLKBz0s4sbGQ@mail.gmail.com>

Hi,

>> > http://logs.guix.gnu.org/guix/2020-11-19.log#182349
>
>> Right, so I shouldn't have pushed to "wip-r" in the first place.
>
> Well, I think it is a lack of synchronisation between all of 3;
> especially with this work around via external GitHub upstream.

Yeah, sorry.  I didn’t realize wip-r was worked on by any one other than
simon and myself.  The commits are still there, they just don’t have a
named pointer (= branch) to them any longer:

https://git.savannah.gnu.org/cgit/guix.git/log/?id=8ed6a08a998d4abd58eb67c85699f38f87f76d05

If that’s the last commit (or if you have another one that was pushed) I
can simply reset the branch pointer to it and then stay out of it :)

>
>> Perhaps I should do it "the old way" and base my patches on the master
>> branch and send the gazillion patches to the mailing list. :)
>
> What Ricardo did previously (my rewrite of history on Nov. 10 on
> GitHub, and then pushed by Ricardo to Savannah today), quoting their
> word: "delete origin/wip-r, reset my local copy to zimoun/wip-r,
> rebased on top of origin/master, and pushed origin/wip-r".  Maybe you
> could do the same.
>
> Or if you have the super power to do that: you can delete the branch
> and re-push.

Deleting the branch is “git push -d origin wip-r”.

>> Then we can discuss each line of the commit messages separately before
>> pushing to the master branch.
>
> Well, I do not know what Ricardo thinks, but personally I would prefer
> first a wip-r branch then merge.  It will avoid avoid annoyance of
> possible broken packages, I mean we could detect them.

Same.  I prefer having a branch so ci.guix.gnu.org can build things and
we can keep an eye on the fall-out (if any).

Sorry again for making this harder than it should be!

-- 
Ricardo


  reply	other threads:[~2020-11-19 21:13 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-16 10:49 Updating to latest Bioconductor release Roel Janssen
2020-11-16 11:27 ` zimoun
2020-11-16 12:10   ` Roel Janssen
2020-11-16 12:29     ` zimoun
2020-11-16 12:38       ` Roel Janssen
2020-11-16 12:59         ` zimoun
2020-11-17 22:58 ` zimoun
2020-11-18  9:31   ` Roel Janssen
2020-11-18 11:50     ` zimoun
2020-11-18 16:13       ` Roel Janssen
2020-11-18 16:23         ` zimoun
2020-11-18 16:33           ` Roel Janssen
2020-11-18 16:59             ` zimoun
2020-11-19 15:31               ` Roel Janssen
2020-11-19 15:36                 ` zimoun
2020-11-19 15:57                   ` Roel Janssen
2020-11-19 16:18                     ` zimoun
2020-11-19 16:25                       ` Roel Janssen
2020-11-19 16:36                         ` zimoun
2020-11-19 17:27                         ` zimoun
2020-11-19 19:03                           ` Roel Janssen
2020-11-19 19:18                             ` zimoun
2020-11-19 21:13                               ` Ricardo Wurmus [this message]
2020-11-20  9:16                                 ` Roel Janssen
2020-11-20 13:39                                   ` Ricardo Wurmus
2020-11-20 13:42                                     ` Ricardo Wurmus
2020-11-20 14:02                                       ` zimoun
2020-11-20 14:10                                       ` Roel Janssen
2020-11-20 13:59                                     ` zimoun
2020-11-20 14:28                                       ` Ricardo Wurmus
2020-11-20 15:20                                         ` zimoun

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=873615aw3m.fsf@elephly.net \
    --to=rekado@elephly.net \
    --cc=guix-devel@gnu.org \
    --cc=zimon.toutoune@gmail.com \
    /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.