Branch: refs/heads/2.063
  Home:   https://github.com/D-Programming-Language/dmd
  Commit: 47260a9a67112d55698ff6bb1a374cd7bc44d500
      https://github.com/D-Programming-Language/dmd/commit/47260a9a67112d55698ff6bb1a374cd7bc44d500
  Author: Walter Bright <walter@walterbright.com>
  Date:   2013-06-01 (Sat, 01 Jun 2013)

  Changed paths:
    M src/cast.c
    A test/fail_compilation/ice10212.d

  Log Message:
  -----------
  Merge pull request #2101 from 9rnsr/fix10212

[REG2.061] Issue 10212 - Segfault in mismatching delegate literal types

Some hours ago I pushed three commits to 2.063 branch, but they are now
lost...
If Walter does not use `git push -f`, I cannot understand why this commit
forcibly update diverge 2.063 branch...

Kenji Hara

2013/6/2 GitHub <noreply@github.com>

>   Branch: refs/heads/2.063
>   Home:   https://github.com/D-Programming-Language/dmd
>   Commit: 47260a9a67112d55698ff6bb1a374cd7bc44d500
>
> https://github.com/D-Programming-Language/dmd/commit/47260a9a67112d55698ff6bb1a374cd7bc44d500
>   Author: Walter Bright <walter@walterbright.com>
>   Date:   2013-06-01 (Sat, 01 Jun 2013)
>
>   Changed paths:
>     M src/cast.c
>     A test/fail_compilation/ice10212.d
>
>   Log Message:
>   -----------
>   Merge pull request #2101 from 9rnsr/fix10212
>
> [REG2.061] Issue 10212 - Segfault in mismatching delegate literal types
>
>
>
>
> _______________________________________________
> dmd-internals mailing list
> dmd-internals@puremagic.com
> http://lists.puremagic.com/mailman/listinfo/dmd-internals
>

It's important to get to the bottom of this. Walter, did you do anything unusual?

As a rule of thumb, we should NEVER push with -f to the repo.


Andrei

On 6/1/13 7:00 PM, Kenji Hara wrote:
> Some hours ago I pushed three commits to 2.063 branch, but they are now
> lost...
> If Walter does not use `git push -f`, I cannot understand why this
> commit forcibly update diverge 2.063 branch...
>
> Kenji Hara
>
> 2013/6/2 GitHub <noreply@github.com <mailto:noreply@github.com>>
>
>        Branch: refs/heads/2.063
>        Home: https://github.com/D-Programming-Language/dmd
>        Commit: 47260a9a67112d55698ff6bb1a374cd7bc44d500
>     https://github.com/D-Programming-Language/dmd/commit/47260a9a67112d55698ff6bb1a374cd7bc44d500
>        Author: Walter Bright <walter@walterbright.com
>     <mailto:walter@walterbright.com>>
>        Date:   2013-06-01 (Sat, 01 Jun 2013)
>
>        Changed paths:
>          M src/cast.c
>          A test/fail_compilation/ice10212.d
>
>        Log Message:
>        -----------
>        Merge pull request #2101 from 9rnsr/fix10212
>
>     [REG2.061] Issue 10212 - Segfault in mismatching delegate literal types
>
>
>
>
>     _______________________________________________
>     dmd-internals mailing list
>     dmd-internals@puremagic.com <mailto:dmd-internals@puremagic.com>
>     http://lists.puremagic.com/mailman/listinfo/dmd-internals
>
>
>
>
> _______________________________________________
> dmd-internals mailing list
> dmd-internals@puremagic.com
> http://lists.puremagic.com/mailman/listinfo/dmd-internals
_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals

Oh, so *that's* what went wrong! This is entirely my fault.

I was pushing one of the regressions to 2.063, and github kept saying:

----------------------------------
mercury ~/dpl/dmd> git push origin 2.063
To git@github.com:D-Programming-Language/dmd.git
 ! [rejected]        2.063 -> 2.063 (non-fast-forward)
error: failed to push some refs to 'git@github.com:D-Programming-Language/dmd.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again.  See the 'Note about
fast-forwards' section of 'git push --help' for details.
-----------------------------------

git status, of course, told me nothing, so I tried git push -f.

Sorry.


On 6/1/2013 4:50 PM, Andrei Alexandrescu wrote:
> It's important to get to the bottom of this. Walter, did you do anything unusual?
>
> As a rule of thumb, we should NEVER push with -f to the repo.
>
>
> Andrei
>
> On 6/1/13 7:00 PM, Kenji Hara wrote:
>> Some hours ago I pushed three commits to 2.063 branch, but they are now
>> lost...
>> If Walter does not use `git push -f`, I cannot understand why this
>> commit forcibly update diverge 2.063 branch...
>>
>> Kenji Hara
>>
>> 2013/6/2 GitHub <noreply@github.com <mailto:noreply@github.com>>
>>
>>        Branch: refs/heads/2.063
>>        Home: https://github.com/D-Programming-Language/dmd
>>        Commit: 47260a9a67112d55698ff6bb1a374cd7bc44d500
>> https://github.com/D-Programming-Language/dmd/commit/47260a9a67112d55698ff6bb1a374cd7bc44d500
>>        Author: Walter Bright <walter@walterbright.com
>>     <mailto:walter@walterbright.com>>
>>        Date:   2013-06-01 (Sat, 01 Jun 2013)
>>
>>        Changed paths:
>>          M src/cast.c
>>          A test/fail_compilation/ice10212.d
>>
>>        Log Message:
>>        -----------
>>        Merge pull request #2101 from 9rnsr/fix10212
>>
>>     [REG2.061] Issue 10212 - Segfault in mismatching delegate literal types
>>
>>
>>
>>
>>     _______________________________________________
>>     dmd-internals mailing list
>>     dmd-internals@puremagic.com <mailto:dmd-internals@puremagic.com>
>>     http://lists.puremagic.com/mailman/listinfo/dmd-internals
>>
>>
>>
>>
>> _______________________________________________
>> dmd-internals mailing list
>> dmd-internals@puremagic.com
>> http://lists.puremagic.com/mailman/listinfo/dmd-internals
> _______________________________________________
> dmd-internals mailing list
> dmd-internals@puremagic.com
> http://lists.puremagic.com/mailman/listinfo/dmd-internals
>
>

_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals

On Saturday, June 01, 2013 17:18:23 Walter Bright wrote:
> Oh, so *that's* what went wrong! This is entirely my fault.
> 
> I was pushing one of the regressions to 2.063, and github kept saying:
> 
> ----------------------------------
> mercury ~/dpl/dmd> git push origin 2.063
> To git@github.com:D-Programming-Language/dmd.git
>   ! [rejected]        2.063 -> 2.063 (non-fast-forward)
> error: failed to push some refs to
> 'git@github.com:D-Programming-Language/dmd.git' To prevent you from losing
> history, non-fast-forward updates were rejected Merge the remote changes
> before pushing again.  See the 'Note about fast-forwards' section of 'git
> push --help' for details.
> -----------------------------------
> 
> git status, of course, told me nothing, so I tried git push -f.
> 
> Sorry.

Either you rebased locally and altered some commits which came from the main repository, or you had changes which conflicted with what was in the master repo. In the first case, you screwed up by rebasing changes which weren't yours. In the second, what you needed to have done was

git pull --rebase upstream master

and deal with any conflicts locally. Instead, you just clobbered what was in the main repo.

- Jonathan M Davis
_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals

2013/6/2 Walter Bright <walter@digitalmars.com>

> Oh, so *that's* what went wrong! This is entirely my fault.
>
> I was pushing one of the regressions to 2.063, and github kept saying:
>
> ------------------------------**----
> mercury ~/dpl/dmd> git push origin 2.063
> To git@github.com:D-Programming-**Language/dmd.git
>  ! [rejected]        2.063 -> 2.063 (non-fast-forward)
> error: failed to push some refs to 'git@github.com:D-Programming-**
> Language/dmd.git'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes before pushing again.  See the 'Note about
> fast-forwards' section of 'git push --help' for details.
> ------------------------------**-----
>
> git status, of course, told me nothing, so I tried git push -f.
>
> Sorry.
>

...OK. I completely recognized that we should have "release-script" ASAP.

Kenji Hara

On 2 jun 2013, at 02:18, Walter Bright <walter@digitalmars.com> wrote:

> Oh, so *that's* what went wrong! This is entirely my fault.
> 
> I was pushing one of the regressions to 2.063, and github kept saying:
> 
> ----------------------------------
> mercury ~/dpl/dmd> git push origin 2.063
> To git@github.com:D-Programming-Language/dmd.git
> ! [rejected]        2.063 -> 2.063 (non-fast-forward)
> error: failed to push some refs to 'git@github.com:D-Programming-Language/dmd.git'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes before pushing again.  See the 'Note about
> fast-forwards' section of 'git push --help' for details.
> -----------------------------------
> 
> git status, of course, told me nothing, so I tried git push -f.
> 
> Sorry.

You need to sync with upstream first before you can run "git status". You can do that with "git fetch upstream".

-- 
/Jacob Carlborg

_______________________________________________
dmd-internals mailing list
dmd-internals@puremagic.com
http://lists.puremagic.com/mailman/listinfo/dmd-internals