[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: dev/staging fail: illegal entry in bfrange
From: |
David Kastrup |
Subject: |
Re: dev/staging fail: illegal entry in bfrange |
Date: |
Sat, 29 Oct 2011 09:40:31 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.90 (gnu/linux) |
David Kastrup <address@hidden> writes:
> David Kastrup <address@hidden> writes:
>
>> Graham Percival <address@hidden> writes:
>>
>>> On Sat, Oct 29, 2011 at 08:43:20AM +0200, David Kastrup wrote:
>>>>
>>>> After having my local staging up-to-date,
>>>> I just pushed staging~1 to origin/dev/staging.
>>>
>>> thanks, checked and pushed to master.
>>
>> Sigh. Again it has not been fast-forwarded, but the history has been
>> straightened out, dissolving my merge commit.
>>
>> So much for keeping bijection intact. We need to figure out what
>> happens here: I should have thought that the history was perfectly
>> fast-forwardable.
>
> Maybe somebody with shell server access (is there anybody? or a tool?)
> can run git reflog on the server so that one can take a look at the
> first page or so?
Anyway, for now I propose that Patchy _only_ tries straight pushes of
dev/staging to master. No rebase of any kind. If staging is not a
proper descendant of master, this can always be fixed manually.
Perhaps let Patchy send a mail to the list when master or staging
changed since the last attempt, and the push still fails.
--
David Kastrup
- dev/staging fail: illegal entry in bfrange, Graham Percival, 2011/10/29
- Re: dev/staging fail: illegal entry in bfrange, David Kastrup, 2011/10/29
- Re: dev/staging fail: illegal entry in bfrange, Graham Percival, 2011/10/29
- Re: dev/staging fail: illegal entry in bfrange, David Kastrup, 2011/10/29
- Re: dev/staging fail: illegal entry in bfrange, David Kastrup, 2011/10/29
- Re: dev/staging fail: illegal entry in bfrange, Graham Percival, 2011/10/29
- Re: dev/staging fail: illegal entry in bfrange, David Kastrup, 2011/10/29
- Re: dev/staging fail: illegal entry in bfrange, David Kastrup, 2011/10/29
- Re: dev/staging fail: illegal entry in bfrange,
David Kastrup <=
- Re: dev/staging fail: illegal entry in bfrange, Graham Percival, 2011/10/29
- Re: dev/staging fail: illegal entry in bfrange, David Kastrup, 2011/10/29
- Re: dev/staging fail: illegal entry in bfrange, mike, 2011/10/29