summaryrefslogtreecommitdiff
path: root/test/files/neg
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'scala/2.10.x' into patmat-refactor-masterAdriaan Moors2013-02-121-0/+6
|\
| * silences t6323aEugene Burmako2013-02-111-0/+6
* | Merge pull request #2057 from paulp/pr/revert-6355Paul Phillips2013-02-122-2/+11
|\ \
| * | SI-6355, weakend implementation restriction on applyDynamic.Paul Phillips2013-02-122-2/+11
* | | Maintenance of Predef.Paul Phillips2013-02-128-15/+15
|/ /
* | Merge remote-tracking branch 'origin/2.10.x' into merge-210Paul Phillips2013-02-107-10/+21
|\|
| * Merge pull request #2095 from hubertp/ticket/5675James Iry2013-02-084-1/+11
| |\
| | * SI-5675 Discard duplicate feature warnings at a positionJason Zaugg2013-02-084-1/+11
| * | Merge pull request #2017 from retronym/ticket/6666James Iry2013-02-0810-32/+105
| |\ \
| * \ \ Merge pull request #2079 from JamesIry/2.10.x_SI-7070James Iry2013-02-073-6/+7
| |\ \ \
| | * | | SI-7070 Turn restriction on companions in pkg objs into warningJames Iry2013-02-063-6/+7
| | | |/ | | |/|
| * | | Merge pull request #2068 from scalamacros/ticket/7064Adriaan Moors2013-02-0710-13/+28
| |\ \ \
| | * | | [nomaster] Revert "refactors handling of parent types"Eugene Burmako2013-02-057-10/+22
| | * | | [nomaster] Revert "introduces global.pendingSuperCall"Eugene Burmako2013-02-053-3/+6
| | |/ /
| | | |
| \ \ \
| \ \ \
| \ \ \
*---. \ \ \ Merge commit 'b43ae58f31'; commit 'b579a42ee3'; commit '81fa831609' into merg...Paul Phillips2013-02-1010-32/+105
|\ \ \ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/|
| | | * | SI-6666 Catch VerifyErrors in the making in early defs.Jason Zaugg2013-02-022-4/+15
| | | * | Broader checks for poisonous this references.Jason Zaugg2013-02-0210-49/+90
| | | * | Add a test case from the comments of SI-6666.Jason Zaugg2013-02-022-0/+21
* | | | | Merge commit '81d8f9d3da' into merge-210Paul Phillips2013-02-092-1/+7
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | [nomerge] SI-6667 Demote a new ambiguity error to a lint warning.Jason Zaugg2013-02-044-2/+6
| | |_|/ | |/| |
| * | | Merge pull request #2022 from lrytz/analyzerPlugins210Lukas Rytz2013-02-033-3/+32
| |\ \ \
| * \ \ \ Merge pull request #2019 from scalamacros/ticket/6539Eugene Burmako2013-02-012-1/+7
| |\ \ \ \
| | * | | | SI-6539 moves @compileTimeOnly away from scala-reflectEugene Burmako2013-01-312-1/+7
| | | |/ / | | |/| |
* | | | | Merge commit 'f3cdf146709e0dd98533ee77e8ca2566380cb932'Lukas Rytz2013-02-043-3/+32
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | SI-1803, plus documentation and cleanups in Namers, mainly in typeSigLukas Rytz2013-02-033-3/+32
| |/ / /
| * | | Merge pull request #1975 from retronym/ticket/6601-revertJames Iry2013-02-013-8/+0
| |\ \ \
| | * | | Revert "SI-6601 Publicise derived value contstructor after pickler"Jason Zaugg2013-01-263-8/+0
| | |/ /
| * | | Merge pull request #1980 from retronym/backport/1518Adriaan Moors2013-02-014-0/+47
| |\ \ \
| | * | | [backport] SI-2968 Fix brace healing for `^case (class|object) {`Jason Zaugg2013-01-264-0/+47
| | |/ /
* | | | Cleaning up after brutal merge of 2.10.x into master.Paul Phillips2013-02-024-35/+3
* | | | Merge commit 'b403234a27' into wip/fresh-merge2Paul Phillips2013-02-019-8/+45
|\| | |
| * | | Merge pull request #1998 from JamesIry/2.10.x_6963_2Adriaan Moors2013-02-019-6/+45
| |\ \ \
| | * | | SI-6963 Add version to -XmigrationJames Iry2013-01-299-6/+45
| * | | | Merge pull request #2015 from paulp/rc1-backportsPaul Phillips2013-01-316-2/+21
| |\ \ \ \
| | * | | | SI-6426, importable _.Paul Phillips2013-01-302-0/+12
| | * | | | SI-5353, imperfect error message.Paul Phillips2013-01-304-2/+9
| | |/ / /
| * | | | Merge pull request #2000 from adriaanm/backport-pr-1873Paul Phillips2013-01-312-0/+85
| |\ \ \ \
| | * | | | [backport] SI-5378, unsoundness with type bounds in refinements.Paul Phillips2013-01-282-0/+85
| | |/ / /
| * | | | Merge pull request #2036 from scalamacros/ticket/5716Paul Phillips2013-01-313-0/+20
| |\ \ \ \
| | * | | | changes the flags to not depend on partestEugene Burmako2013-01-311-1/+1
| | * | | | the scanner is now less eager about deprecationsEugene Burmako2013-01-313-0/+20
| | | |/ / | | |/| |
* | | | | Merge commit '644eb7078a' into wip/fresh-merge2Paul Phillips2013-02-015-56/+9
|\| | | |
| * | | | Merge pull request #1989 from adriaanm/rework-pr-1945Paul Phillips2013-01-313-56/+0
| |\ \ \ \
| | * | | | SI-6968 Simple Tuple patterns aren't irrefutableJason Zaugg2013-01-273-56/+0
| | | |/ / | | |/| |
| * / | | SI-6728 Fixes crash in parser on incomplete for expressionJames Iry2013-01-302-0/+9
| |/ / /
* | | | Merge pull request #2013 from paulp/pr/normalize-lessPaul Phillips2013-01-311-10/+2
|\ \ \ \
| * | | | Changes many calls to normalize to dealiasWiden.Paul Phillips2013-01-291-10/+2
* | | | | Merge remote-tracking branch 'origin/2.10.x' into pr/merge-210Paul Phillips2013-01-292-0/+28
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge pull request #1857 from retronym/ticket/6443-2.10.xAdriaan Moors2013-01-272-0/+28
| |\ \ \ | | |/ / | |/| |
| | * | SI-6443 Widen dependent param types in uncurryJason Zaugg2013-01-162-0/+28