Hi,
zimoun skribis:
> On Sun, 7 Jun 2020 at 23:16, Ludovic Courtès wrote:
>
>> I did this:
>>
>>
>> https://git.savannah.gnu.org/cgit/guix.git/commit/?id=1fd7de45f218ce572a3fe87764ad15927e3dbdc4
>
> Cool! Thank you.
>
>> So now, in a situation like John described, ‘guix pull’ will print the
Perfect! Thank you!
Hi Ludo,
On Sun, 7 Jun 2020 at 23:16, Ludovic Courtès wrote:
> I did this:
>
>
> https://git.savannah.gnu.org/cgit/guix.git/commit/?id=1fd7de45f218ce572a3fe87764ad15927e3dbdc4
Cool! Thank you.
> So now, in a situation like John described, ‘guix pull’ will print the
> error and hint for unr
Hi,
zimoun skribis:
>> But yeah, I don’t think there’s much we can do. Or perhaps we could
>> have ‘commit-relation’ report 'unrelated when one of the commits does
>> not exist, that’d be clearer and more useful than this error.
>
> And report a hint.
I did this:
https://git.savannah.gnu.o
Hi Ludo,
On Fri, 5 Jun 2020 at 18:17, Ludovic Courtès wrote:
> Generally, rebasing does not necessarily implies ‘git gc’, so I think
It depends on how "git gc" is configured. Well, I am not a Git
specialist but from my understanding of the manual, by default, these
unreachable commits are kept
Hi Simon,
zimoun skribis:
> $ guix describe
> Generation 37Jun 05 2020 01:28:52(current)
> guix 8bd0b53
> repository URL: https://git.savannah.gnu.org/git/guix.git
> commit: 8bd0b533b30d7ee5e03aee99a2eb96d5b0b1c836
>
> $ echo hello >> $SRC/README && git -C $SRC commit -am hello
Hi,
John Soo skribis:
>> Normally, ‘--allow-downgrades’ does exactly what you need, at least
>> that’s the intent. I’d argue that it’s also reasonable to use it in
>> this case because obviously you know what you’re doing, and you’re
>> pulling from a local Git repository, so that’s fine.
>
> 1
Hi John,
On Thu, 4 Jun 2020 at 16:12, John Soo wrote:
> Oh nice, then this whole issue I think should be to report that
> --allow-downgrades does not allow everything. When I first reported the
> issue I tried --allow-downgrades thanks to some help on IRC. The first
> attempt failed as I menti
Hi Ludo,
On Wed, 3 Jun 2020 at 17:14, Ludovic Courtès wrote:
> >> (This can be overridden this by passing ‘--allow-downgrades’.)
> >
> > Does '--allow-downgrades' support unrelated git histories? I tried that
> > flag and it did not work.
>
> It supports unrelated Git histories. It could reall
Hi Ludo,
Ludovic Courtès writes:
> It supports unrelated Git histories. It could really be called
> ‘--allow-anything’ but I thought it’d be less descriptive. :-)
>
> If you hit a problem with that, please report it (perhaps I just
> overlooked it in the other issue.)
Oh nice, then this whole
Hello,
John Soo skribis:
> Ludovic Courtès writes:
[...]
>> (This can be overridden this by passing ‘--allow-downgrades’.)
>
> Does '--allow-downgrades' support unrelated git histories? I tried that
> flag and it did not work.
It supports unrelated Git histories. It could really be called
Hi Ludo!
I hope you are well.
Ludovic Courtès writes:
> What happens is that ‘guix pull’ ensures that it only ever makes
> “fast-forward” updates by default, in Git parlance. The goal is to
> detect obvious “downgrade attacks”:
>
> https://issues.guix.gnu.org/41425
Oh I see, I'm sorry I did
Hi John,
John Soo skribis:
> I use a local git repo with branch that I specify in channels.scm.
> My usual workflow is:
>
> 1. rebase on origin
> 2. guix pull
>
> This stopped working with the following error:
>
> Updating channel 'guix' from Git repository at
> 'file:///home/john/projects/guix
Hello again,
zimoun writes:
> On Sun, 31 May 2020 at 07:04, John Soo wrote:
>
>> My problem largely comes from the fact that I specified a branch in
>> channels.scm for over a year with the same workflow. If a branch can
>> be specified for a channel repo then the system probably should
>> hand
Dear John,
On Sun, 31 May 2020 at 07:04, John Soo wrote:
> My problem largely comes from the fact that I specified a branch in
> channels.scm for over a year with the same workflow. If a branch can be
> specified for a channel repo then the system probably should handle the
> current pull com
Dear Arne,
On Sat, 30 May 2020 at 18:18, Arne Babenhauserheide wrote:
> This sounds like a use-case for changeset evolution with
> hidden-but-retrievable commits:
> https://www.mercurial-scm.org/doc/evolution/index.html
>
> With that you can rebase and have linear surface history, but the
> rewr
Hi Arne,
Interesting idea about mercurial.
My problem largely comes from the fact that I specified a branch in
channels.scm for over a year with the same workflow. If a branch can be
specified for a channel repo then the system probably should handle the current
pull commit not being available
John Soo writes:
> I guess that makes me wonder what the desired specification is.
> There is a lot of problem space to explore. As a user I would want to
> be able to take my local patches as "the real truth".
>
> Because guix has a linear git history, that means the user needs to
> always re
Hi John,
On Sat, 30 May 2020 at 04:26, John Soo wrote:
> Yeah guix pull --commit=1444040933 --allow-downgrades failed.
Hum? with this message:
--8<---cut here---start->8---
guix pull: error: Git error: object not found - no match for id
(57518fc7bf1efc899c0
Hello,
zimoun writes:
> Is "guix pull --commit=1444040933 --allow-downgrades" not working for you?
Yeah guix pull --commit=1444040933 --allow-downgrades failed.
> What do you mean? An option for you or an option of "guix pull"?
> Ah my bad, it is "--roll-back". The double "--roll-back" and
>
On Fri, 29 May 2020 at 20:22, John Soo wrote:
> Ah, I think that is the problem. I want to keep my same patches which
> are rebased on top of origin/master. The patch contents are the same but
> the commit hash has changed to something else.
Hehe! Dangerous zone. :-)
Personally, I keep clean ~/
Hello,
zimoun writes:
> Maybe, you can try:
>
>guix pull --commit=57518fc7bf1efc899c0dabaa76685a319661f8e4
> --allow-downgrades
> if 57518fc7 is really in your channel at ~/john/projects/guix/.git --
> I mean, you have replaced 'https://' by a local clone where you are
> committing stuff,
On Fri, 29 May 2020 at 19:10, John Soo wrote:
> Guix describe has 57518fc7bf1efc899c0dabaa76685a319661f8e4
> as the current comment.
Maybe, you can try:
guix pull --commit=57518fc7bf1efc899c0dabaa76685a319661f8e4
--allow-downgrades
if 57518fc7 is really in your channel at ~/john/projects/gu
Hi there,
zimoun writes:
> Hi John,
>
> On Fri, 29 May 2020 at 18:39, John Soo wrote:
>
> Have you used '--allow-downgrades' before or after the big remove?
> And your current 'guix describe' is 57518fc7, right?
I used it after the cache removal unfortunately.
Guix describe has 57518fc7bf1efc
Hi John,
On Fri, 29 May 2020 at 18:39, John Soo wrote:
> Updating channel 'guix' from Git repository at
> 'file:///home/john/projects/guix/.git'...
> guix pull: error: aborting update of channel 'guix' to commit
> 1444040933ac35b967720288dc30ed70e5481ed3, which is not a descendant of
> 57518f
Hi Guix,
I use a local git repo with branch that I specify in channels.scm.
My usual workflow is:
1. rebase on origin
2. guix pull
This stopped working with the following error:
Updating channel 'guix' from Git repository at
'file:///home/john/projects/guix/.git'...
guix pull: error: aborting
26 matches
Mail list logo
