Please hold off on the merge of 37128. Justin just informed me there is a new version of polymer_expressions which I should use.

So this is a request to just merge 37125? Treating as such.

Removed this from the milestone.
Added this to the 1.5 milestone.
Added NeedsInfo label.
Changed the title to: "Please merge 37125".

Added New label.
Changed the title to: "Please merge 37125 to trunk".

This does not merge cleanly:
ricow@nobbo:~/merge$ svn merge -c 37125 https://dart.googlecode.com/svn/branches/bleeding_edge trunk

Conflict discovered in 'trunk/dart/runtime/bin/vmservice/client/lib/src/app/location_manager.dart'.

--- Merging r37125 into 'trunk/dart':
C trunk/dart/runtime/bin/vmservice/client/lib/src/app/location_manager.dart
Conflict discovered in 'trunk/dart/runtime/bin/vmservice/client/lib/src/app/application.dart'.
C trunk/dart/runtime/bin/vmservice/client/lib/src/app/application.dart
Conflict discovered in 'trunk/dart/runtime/bin/vmservice/client/lib/src/elements/nav_bar.html'.
C trunk/dart/runtime/bin/vmservice/client/lib/src/elements/nav_bar.html
U trunk/dart/runtime/bin/vmservice/client/lib/src/elements/isolate_summary.html
U trunk/dart/runtime/bin/vmservice/client/lib/service_html.dart

Set owner to @johnmccutchan.
Added NeedsInfo label.

Attached is a patch against trunk that updates the deployed version of Observatory for 1.5.

Attachment:
observatory15.patch (1.14 MB)

The supplied patch is more more than just 37125 and 37128 - it is pretty hard to provide good log entries in the 1.5 commit log when I don't know what I am effectively merging (I am taking this over anyway, please update here anyway so we can track it)

Hi,

Sorry for leaving that information out, the attached patch is: 37014, 37125, 37128, and 37204 but only the changes in deployed directory, not the dart sources used only for development.

The reason my original request (37125 & 37128) didn't apply cleanly was because I was under the impression 37104 made it into the final full push to trunk.

John

Fixed in r37221 (1.5.0-dev.4.6).

I wonder if it's really a good idea to leave out the development Dart files. It seems like that could cause interesting conflicts in the future when merging additional fixes over. Basically, all future fixes for the Observatory now needs more manual work which is a bad thing.

Added Fixed label.
Changed the title to: "Please merge 37014, 37125, 37128, and 37204 to trunk".