hanyi8000
/
Scala
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Scala/tools
History
Seth Tisue 17633b2db3 Merge branch '2.12.x' into 2.13.x 
no interesting merge conflicts.  versions.properties is always a
conflict factory, and HashMap.scala was because of parallel
collections removal.

% export mb=$(git merge-base origin/2.12.x origin/2.13.x)
% git log --graph --oneline --decorate $mb..origin/2.12.x | cat
*   96cdfb4403 (origin/HEAD, origin/2.12.x) Merge pull request #5741 from monkey-mas/bump-up-sbt-jmh-to-0.2.21
|\
| * 08f753e953 Bump up sbt-jmh to 0.2.21
*   38baf2ba9b Merge pull request #5771 from som-snytt/issue/regex-doc-err
|\
| * cc1b8f37a4 Fix and improve Regex doc
* |   6f905fd573 Merge pull request #5747 from dwijnand/fix-root-package-task
|\ \
| * | 4c1c8de34b Rewire package to osgiBundle for OSGi-enabled projects
|  /
* |   57948c8745 Merge pull request #5791 from SethTisue/cruft-begone
|\ \
| * | 4b9816100c remove test/pending directory too
| * | 25048bc737 (SethTisue/cruft-begone) rm -r test/{flaky,disabled*,checker-tests,support,debug}
| * | 0563c4b23c remove orphaned checkfiles
| * | 36357f3f83 remove two empty source files
| * | 8690809333 fix typos
| * | 8177b99fa6 unset a stray execute bit
* | |   c7c21525ec Merge pull request #5776 from lrytz/numbersCleanup
|\ \ \
| * | | 77e0602483 cleanups and clarifications in versions.properties
|  / /
* | |   95a263ecec Merge pull request #5789 from ceeph/patch-1
|\ \ \
| |/ /
|/| |
| * | a9ba3e675a Fix table formatting
|/ /
* |   6048c661f7 Merge pull request #5780 from lrytz/bootstrapOverwrite
|\ \
| * | 6ff389166e Use a single repository in the bootstrap job
|/ /
* |   0dab108872 Merge pull request #5777 from som-snytt/issue/10226
|\ \
| * | c77b420769 SI-10226 REPL handles paste when colorized
|/ /
* |   d0c26206e6 Merge pull request #5756 from rorygraves/2.12.x_depthboxing
|\ \
| * | f7cd76b532 Reduce boxing of scala.reflect.internal.Depth
|  /
* |   17e057bcc8 Merge pull request #5755 from rorygraves/2.12.x_map4
|\ \
| * | 0c6d4e5972 Performance improvements for Map4 to HashMap nad Set4 to HashSet transitions
| * | aefc8f4936 Add benchmarks for Map4 to HashMap and Set4 to HashSet transitions
| * | fad8b95335 Fix compile error on existing ListBenchmark
|  /
* |   3fadf69917 Merge pull request #5675 from piyush-jaiswal/issue/9729
|\ \
| |/
|/|
| * cc99026540 Add tests for ConsoleReporter.
*   6e9268b08e Merge pull request #5761 from lrytz/sd329
|\
| * 6abb6ba47a Don't use `equals` for comparing java.lang.Double/Float
*   680d866142 Merge pull request #5719 from retronym/ticket/10187
|\
| * 898fa00a76 SI-10187 Support mutation of mutable.HashMap in getOrElseUpdate
*   0e38f28e33 Merge pull request #5767 from som-snytt/issue/5621
|\
| * dea2171a1c SI-5621 Missing implicits are supplied by defaults
*   482879f27b Merge pull request #5769 from som-snytt/issue/8969
|\
| * 050811bd84 SI-8969 Accept poly+implicit for assignment syntax
* cba77cece5 Merge pull request #5766 from lrytz/versionsReadme
* 8fcb9f170e Adapt README to new version numbers
% git merge origin/2.12.x
% git status
...
	both modified:   src/library/scala/collection/mutable/HashMap.scala
	deleted by them: test/pending/shootout/fasta.scala
	both modified:   versions.properties
% git rm --force test/pending/shootout/fasta.scala
% emacs versions.properties
% git add -u versions.properties
% emacs src/library/scala/collection/mutable/HashMap.scala
% git add -u src/library/scala/collection/mutable/HashMap.scala
 		2017-03-21 16:21:45 -07:00
..
abspath Some new tools for the tools directory. 2010-02-15 20:00:36 +00:00
class-dump New .gitattributes file. 2012-09-20 09:57:00 -07:00
cleanup-commit Space/Tab cleanup script - run before committing 2012-03-16 01:43:27 +01:00
compare-java-sigs SI-3452 Correct Java generic signatures for mixins, static forwarders 2014-02-09 22:28:23 +01:00
cpof Updated tools/*cp scripts. 2012-06-06 14:23:44 -07:00
jar-dump New .gitattributes file. 2012-09-20 09:57:00 -07:00
pathResolver More work on classpaths. 2010-02-11 15:10:45 +00:00
rm-orphan-checkfiles Merge branch '2.12.x' into 2.13.x 2017-03-21 16:21:45 -07:00
scaladoc-compare Fix many typos 2015-04-21 11:44:09 -07:00
scaladoc-diff Switch remaining uses of ant over to sbt 2016-08-23 16:05:06 +02:00
verify-jar-cache Adapted tools/verify-jar-cache for Ubuntu 2012-03-16 16:44:14 +01:00