10000 Merge 2.11 to 2.12 by lrytz · Pull Request #5055 · scala/scala · GitHub
[go: up one dir, main page]
Skip to content

Merge 2.11 to 2.12 #5055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 16 commits into from
Mar 23, 2016
Merged

Merge 2.11 to 2.12 #5055

merged 16 commits into from
Mar 23, 2016

Conversation

lrytz
Copy link
Member
@lrytz lrytz commented Mar 21, 2016

Follow-up for #5054

$ git log --decorate --oneline -1 intellij-2.11 | cat
5f5cc18 (origin/intellij-2.11, intellij-2.11) Update IntelliJ build for use with sbt

$ git log --decorate --oneline -1 2.12.x | cat
ad48e59 (HEAD -> merge-2.11-to-2.12-mar-21, upstream/2.12.x, origin/2.12.x, 2.12.x) Merge pull request #5043 from dongjoon-hyun/fix_typos_in_spec_and_comments

$ export MB=$(git merge-base 2.12.x intellij-2.11)

$ git checkout 2.12.x
$ git checkout -b merge-2.11-to-2.12-mar-21

$ git log --graph --oneline --decorate $MB...intellij-2.11 | cat
* 5f5cc18 (origin/intellij-2.11, intellij-2.11) Update IntelliJ build for use with sbt
* afb1458 (upstream/2.11.x, origin/2.11.x, 2.11.x) Merge pull request #5030 from SethTisue/newer-akka
* 22b7905 Merge branch '2.11.x' into newer-akka
* bd4926f bundle a newer Akka actors jar

$ git merge afb1458 -s ours
Merge made by the 'ours' strategy.
$ git diff 2.12.x | cat
$

$ git merge 5f5cc18
$ git status -sb
## merge-2.11-to-2.12-mar-21
M  .gitignore
M  build.sbt
UU project/plugins.sbt
  - fix conflict
A  project/project/plugins.sbt
UU src/intellij/README.md
  - pick version from 2.11
DU src/intellij/actors.iml.SAMPLE
  - keep
D  src/intellij/asm.iml.SAMPLE
M  src/intellij/compiler.iml.SAMPLE
D  src/intellij/diff.sh
DU src/intellij/forkjoin.iml.SAMPLE
  - keep
M  src/intellij/interactive.iml.SAMPLE
UU src/intellij/junit.iml.SAMPLE
  - pick 2.11 version
M  src/intellij/library.iml.SAMPLE
M  src/intellij/manual.iml.SAMPLE
M  src/intellij/partest-extras.iml.SAMPLE
M  src/intellij/partest-javaagent.iml.SAMPLE
M  src/intellij/reflect.iml.SAMPLE
R  src/intellij/test-junit.iml.SAMPLE -> src/intellij/repl-jline.iml.SAMPLE
M  src/intellij/repl.iml.SAMPLE
M  src/intellij/scala-build.iml.SAMPLE
M  src/intellij/scala.iml.SAMPLE
UU src/intellij/scala.ipr.SAMPLE
  - fix conflict
M  src/intellij/scaladoc.iml.SAMPLE
M  src/intellij/scalap.iml.SAMPLE
D  src/intellij/setup.sh
UU src/intellij/test.iml.SAMPLE
  - fix conflict
D  src/intellij/update.sh

SethTisue and others added 8 commits March 8, 2016 23:40
@SethTisue
upgrade to latest scala-xml (namely 1.0.5)
76f633c 
there shouldn't be user-visible changes since 1.0.4, but regardless,
it's good to depend on the latest
@SethTisue
bundle a newer Akka actors jar
bd4926f 
might as well let people have the current stuff. I asked the
Akka folks and nobody saw a reason not to upgrade.  this
version of Akka is the latest in the 2.3.x series, but is
also some months old, so no stability worries.

(this would have been included in 2.11.8 if I had thought of
it in time)
@SethTisue
Merge branch '2.11.x' into scala-xml-version-bump
1ae6fc0
@SethTisue
Merge branch '2.11.x' into newer-akka
22b7905
@adriaanm
Merge pull request scala#5030 from SethTisue/newer-akka
afb1458 
bundle a newer Akka actors jar
@lrytz
Update IntelliJ build for use with sbt
5f5cc18
@lrytz
Merge commit 'afb1458' into merge-2.11-to-2.12-mar-21
12bf411
@lrytz
Merge commit '5f5cc18' into merge-2.11-to-2.12-mar-21
4f7cf60
@scala-jenkins scala-jenkins added this to the 2.12.0-M5 milestone Mar 21, 2016
@lrytz lrytz force-pushed the merge-2.11-to-2.12-mar-21 branch from 0e7005e to 3721775 Compare March 21, 2016 11:17
@lrytz
Copy link
Member Author
lrytz commented Mar 21, 2016

Review by @szeiger. The changes to the sbt import scripts for 2.12.x are in a separate commit. The change of the akka-actors in 2.11.x doesn't apply to 2.12.x (we don't pull in akka-actors anymore).

@lrytz lrytz modified the milestones: 2.12.0-M4, 2.12.0-M5 Mar 21, 2016
lrytz and others added 4 commits March 22, 2016 10:00
@lrytz
Cleanup IntelliJ integration based on review feedback
2b3696e
@viktorklang
SI-9488 - adds the same default toString format to Scala Futures as 2…
d832346 
….12.x

Includes tests to verify the toString representations.
@lrytz
Merge pull request scala#5026 from SethTisue/scala-xml-version-bump
46595fb 
upgrade to latest scala-xml (namely 1.0.5)
@lrytz
Merge pull request scala#5056 from viktorklang/wip-SI9488-Future.toSt…
4ef1429 
…ring-√

SI-9488 - adds the same default toString format to Scala Futures as 2…
@szeiger
Copy link
Contributor
szeiger commented Mar 23, 2016

@lrytz This contains the original version of the IntelliJ import commands without the improvements and fixes in the latest PR. Do you want to update this PR with the latest version or follow up with a manual update?

Apart from that, LGTM

@lrytz
Copy link
Member Author
lrytz commented Mar 23, 2016

i'll merge #5054 into 2.11.x and then append a commit here that merges the latest 2.11.x, OK?

@szeiger
Copy link
Contributor
szeiger commented Mar 23, 2016

sounds good

@lrytz
Copy link
Member Author
lrytz commented Mar 23, 2016

here's the log for the second part of the merge (commits pushed):

$ git log --decorate --oneline -1 HEAD | cat
3721775 (HEAD -> merge-2.11-to-2.12-mar-21, origin/merge-2.11-to-2.12-mar-21) Updates to IntelliJ files for 2.12.x

$ git log --decorate --oneline -1 2.11.x | cat
1fcfdd8 (upstream/2.11.x, origin/2.11.x, 2.11.x) Merge pull request #5054 from lrytz/intellij-2.11

$ export MB=$(git merge-base HEAD 2.11.x)

$ git log --graph --oneline --decorate $MB...2.11.x | cat
*   1fcfdd8 (upstream/2.11.x, origin/2.11.x, 2.11.x) Merge pull request #5054 from lrytz/intellij-2.11
|\
| * 2b3696e (origin/intellij-2.11, intellij-2.11) Cleanup IntelliJ integration based on review feedback
*   4ef1429 Merge pull request #5056 from viktorklang/wip-SI9488-Future.toString-√
|\
| * d832346 SI-9488 - adds the same default toString format to Scala Futures as 2.12.x
* 46595fb Merge pull request #5026 from SethTisue/scala-xml-version-bump
* 1ae6fc0 Merge branch '2.11.x' into scala-xml-version-bump
* 76f633c upgrade to latest scala-xml (namely 1.0.5)


  - #5026 changed scala-xml.version.number to 1.0.5, which is already the case in 2.12.x
  - #5056 added Promise.toString and tests, which both already exist in 2.12.x (see #4042)

$ git merge 4ef1429 -s ours
Merge made by the 'ours' strategy.
$ git diff 3721775 | cat
$

$ git merge 1fcfdd8
Auto-merging build.sbt
CONFLICT (content): Merge conflict in build.sbt
  - conflict in the list of modules for which to update intellij (no actors/forkjoin in 2.12.x)

@adriaanm
Copy link
Contributor

LGTM

@adriaanm adriaanm merged commit 6173274 into scala:2.12.x Mar 23, 2016
@lrytz lrytz deleted the merge-2.11-to-2.12-mar-21 branch April 4, 2016 09:41
@adriaanm adriaanm removed the 2.12 label Oct 29, 2016
@adriaanm adriaanm added the 2.12 label Oct 29, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
2.12.0-M4
Development

Successfully merging this pull request may close these issues.
6 participants
@lrytz @szeiger @adriaanm @scala-jenkins @SethTisue @viktorklang
0