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 [email protected]:D-Programming-Language/dmd.git
! [rejected] 2.063 -> 2.063 (non-fast-forward)
error: failed to push some refs to
'[email protected]: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 <[email protected] <mailto:[email protected]>>
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 <[email protected]
<mailto:[email protected]>>
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
[email protected] <mailto:[email protected]>
http://lists.puremagic.com/mailman/listinfo/dmd-internals
_______________________________________________
dmd-internals mailing list
[email protected]
http://lists.puremagic.com/mailman/listinfo/dmd-internals
_______________________________________________
dmd-internals mailing list
[email protected]
http://lists.puremagic.com/mailman/listinfo/dmd-internals
_______________________________________________
dmd-internals mailing list
[email protected]
http://lists.puremagic.com/mailman/listinfo/dmd-internals
