diff options
author | Seth Tisue <seth@tisue.net> | 2015-10-16 13:38:20 +0200 |
---|---|---|
committer | Seth Tisue <seth@tisue.net> | 2015-10-16 13:48:14 +0200 |
commit | 3141fdd6628df5c123db0250abc8ccfcf20d7eff (patch) | |
tree | 9f96dbbf3f27dd4ed3105b7b0562c46e39441220 /src/eclipse | |
parent | c99e53e8a05fc5d45f8e8a28da68d3977be65bfa (diff) | |
parent | ae5f0de71686a250d1bfa72db530015c0f9ddb3a (diff) | |
download | scala-3141fdd6628df5c123db0250abc8ccfcf20d7eff.tar.gz scala-3141fdd6628df5c123db0250abc8ccfcf20d7eff.tar.bz2 scala-3141fdd6628df5c123db0250abc8ccfcf20d7eff.zip |
merge 2.11.x onto 2.12.x, Oct 16 2015
there were merge conflicts in the Eclipse config that I resolved with
--ours. I invite @performantdata to submit a followup PR bringing the
Eclipse stuff into a good state on 2.12.x.
there was a test failure in
test/junit/scala/collection/mutable/OpenHashMapTest.scala
due to the 2.12 compiler emitting the field backing a
private var differently (with an unmangled name). Lukas
says the difference is expected, so I just updated the
code in the test.
there were no other merge conflicts.
% git log --decorate --oneline -1 origin/2.11.x | cat
ae5f0de (origin/HEAD, origin/2.11.x) Merge pull request #4791 from performantdata/issue/9508
% git log --decorate --oneline -1 origin/2.12.x | cat
c99e53e (HEAD -> 2.12.x, origin/2.12.x) Merge pull request #4797 from lrytz/M3-versions
% export MB=$(git merge-base 2.12.x origin/2.11.x)
% echo $MB
42cafa21f3c4a08c6dd34608278f810b6ec2886f
% git log --graph --oneline --decorate $MB...origin/2.11.x | cat
* ae5f0de (origin/HEAD, origin/2.11.x) Merge pull request #4791 from performantdata/issue/9508
|\
| * 08dca37 (origin/pull/4791) SI-9508 fix classpaths in Eclipse configuration
* | fe76232 Merge pull request #4798 from performantdata/issue/9513
|\ \
| * | 9c97a7f (origin/pull/4798) Suppress unneeded import.
| * | 30d704d Document some OpenHashMap internal methods.
| * | 1fb32fc SI-9513 decrement "deleted" count in OpenHashMap.put() when slot reused
| |/
* | 14f875c Merge pull request #4788 from dk14/patch-1
|\ \
| * | 42acd55 (origin/pull/4788) explicitly specify insertion-order feature in docs
| /
* | 68ce049 Merge pull request #4771 from som-snytt/issue/9492-here
|\ \
| * | f290962 (origin/pull/4771) SI-9492 Line trimming paste
| * | bc3589d SI-9492 REPL paste here doc
| /
* | 9834fc8 Merge pull request #4610 from todesking/spec-implicits-remove-obsolete
|\ \
| * | 46009b1 (origin/pull/4610) Add view/context-bound parameter ordering rule
| * | 6eba305 Spec: Implicit parameters with context/view bound is allowed since 2.10
| /
* | d792e35 Merge pull request #4789 from janekdb/2.11.x-param-names-predicates-operations
|\ \
| |/
|/|
| * b19a07e (origin/pull/4789) Rename forall, exists and find predicate and operator params.
|/
* 648c7a1 Merge pull request #4790 from SethTisue/issue/9501
|\
| * 40d12f1 (origin/pull/4790) SI-9501 link README to Scala Hacker Guide
* e0b5891 Merge pull request #4786 from performantdata/issue/9506
* 39acad8 (origin/pull/4786) SI-9506 suppress Scala IDE-generated files in the Eclipse project dirs
* 74dc364 SI-9506 suppress Scala IDE-generated files in the Eclipse project dirs
% git merge ae5f0de
Auto-merging src/repl/scala/tools/nsc/interpreter/ILoop.scala
Auto-merging src/library/scala/util/Either.scala
Auto-merging src/library/scala/runtime/Tuple3Zipped.scala
Auto-merging src/library/scala/runtime/Tuple2Zipped.scala
Auto-merging src/library/scala/collection/parallel/ParIterableLike.scala
Auto-merging src/library/scala/collection/immutable/ListMap.scala
Auto-merging src/library/scala/collection/TraversableLike.scala
Auto-merging src/eclipse/test-junit/.classpath
CONFLICT (content): Merge conflict in src/eclipse/test-junit/.classpath
Auto-merging src/eclipse/scaladoc/.classpath
CONFLICT (content): Merge conflict in src/eclipse/scaladoc/.classpath
Auto-merging src/eclipse/scala-compiler/.classpath
Auto-merging src/eclipse/repl/.classpath
CONFLICT (content): Merge conflict in src/eclipse/repl/.classpath
Auto-merging src/eclipse/partest/.classpath
CONFLICT (content): Merge conflict in src/eclipse/partest/.classpath
Auto-merging src/eclipse/interactive/.classpath
Auto-merging README.md
Automatic merge failed; fix conflicts and then commit the result.
% git checkout --ours src/eclipse/partest/.classpath
% git checkout --ours src/eclipse/repl/.classpath
% git checkout --ours src/eclipse/scaladoc/.classpath
% git checkout --ours src/eclipse/test-junit/.classpath
% git add -u
% emacs test/junit/scala/collection/mutable/OpenHashMapTest.scala
% git diff test/junit/scala/collection/mutable/OpenHashMapTest.scala | cat
...
- val field = m.getClass.getDeclaredField("scala$collection$mutable$OpenHashMap$$deleted")
+ val field = m.getClass.getDeclaredField("deleted")
...
% git add -u
Diffstat (limited to 'src/eclipse')
-rw-r--r-- | src/eclipse/interactive/.gitignore | 2 | ||||
-rw-r--r-- | src/eclipse/partest/.gitignore | 2 | ||||
-rw-r--r-- | src/eclipse/reflect/.gitignore | 2 | ||||
-rw-r--r-- | src/eclipse/repl/.gitignore | 2 | ||||
-rw-r--r-- | src/eclipse/scala-compiler/.gitignore | 2 | ||||
-rw-r--r-- | src/eclipse/scala-library/.gitignore | 2 | ||||
-rw-r--r-- | src/eclipse/scaladoc/.gitignore | 2 | ||||
-rw-r--r-- | src/eclipse/scalap/.gitignore | 2 | ||||
-rw-r--r-- | src/eclipse/test-junit/.gitignore | 2 |
9 files changed, 18 insertions, 0 deletions
diff --git a/src/eclipse/interactive/.gitignore b/src/eclipse/interactive/.gitignore new file mode 100644 index 0000000000..fe789dd686 --- /dev/null +++ b/src/eclipse/interactive/.gitignore @@ -0,0 +1,2 @@ +# what appears to be a Scala IDE-generated file +.cache-main diff --git a/src/eclipse/partest/.gitignore b/src/eclipse/partest/.gitignore new file mode 100644 index 0000000000..fe789dd686 --- /dev/null +++ b/src/eclipse/partest/.gitignore @@ -0,0 +1,2 @@ +# what appears to be a Scala IDE-generated file +.cache-main diff --git a/src/eclipse/reflect/.gitignore b/src/eclipse/reflect/.gitignore new file mode 100644 index 0000000000..fe789dd686 --- /dev/null +++ b/src/eclipse/reflect/.gitignore @@ -0,0 +1,2 @@ +# what appears to be a Scala IDE-generated file +.cache-main diff --git a/src/eclipse/repl/.gitignore b/src/eclipse/repl/.gitignore new file mode 100644 index 0000000000..fe789dd686 --- /dev/null +++ b/src/eclipse/repl/.gitignore @@ -0,0 +1,2 @@ +# what appears to be a Scala IDE-generated file +.cache-main diff --git a/src/eclipse/scala-compiler/.gitignore b/src/eclipse/scala-compiler/.gitignore new file mode 100644 index 0000000000..fe789dd686 --- /dev/null +++ b/src/eclipse/scala-compiler/.gitignore @@ -0,0 +1,2 @@ +# what appears to be a Scala IDE-generated file +.cache-main diff --git a/src/eclipse/scala-library/.gitignore b/src/eclipse/scala-library/.gitignore new file mode 100644 index 0000000000..fe789dd686 --- /dev/null +++ b/src/eclipse/scala-library/.gitignore @@ -0,0 +1,2 @@ +# what appears to be a Scala IDE-generated file +.cache-main diff --git a/src/eclipse/scaladoc/.gitignore b/src/eclipse/scaladoc/.gitignore new file mode 100644 index 0000000000..fe789dd686 --- /dev/null +++ b/src/eclipse/scaladoc/.gitignore @@ -0,0 +1,2 @@ +# what appears to be a Scala IDE-generated file +.cache-main diff --git a/src/eclipse/scalap/.gitignore b/src/eclipse/scalap/.gitignore new file mode 100644 index 0000000000..fe789dd686 --- /dev/null +++ b/src/eclipse/scalap/.gitignore @@ -0,0 +1,2 @@ +# what appears to be a Scala IDE-generated file +.cache-main diff --git a/src/eclipse/test-junit/.gitignore b/src/eclipse/test-junit/.gitignore new file mode 100644 index 0000000000..fe789dd686 --- /dev/null +++ b/src/eclipse/test-junit/.gitignore @@ -0,0 +1,2 @@ +# what appears to be a Scala IDE-generated file +.cache-main |