Bugs web sprint2 2

[will-moore]

This is in dev_4_4 as #450 now for develop...

NB: this commit:
06ad112 Removing unused 'action' from download_annotation() See #9645
was moved from the above PR on to
#459 to try and resolve conflicts!

[bpindelski]

Merge conflicts present. Not merged into gretzky build.

[will-moore]

Not sure what's wrong here. Seems to merge OK with no conflicts when I try it locally:

*   81be273 (HEAD, ome_tiff_export) Merge branch 'bugs_web_sprint2_2' into ome_tiff_export
|\  
* \   2f73114 Merge branch 'batch_remove_annotations_9729' into ome_tiff_export
|\ \  
| | * 69a33ae (gh/bugs_web_sprint2_2, bugs_web_sprint2_2) Fix new-line at end of actions.js to fix merge conflict

[bpindelski]

@will-moore That is strange indeed. The hudson build log has the following output:

2012-11-07 05:01:24,254 DEBUG Calling 'git rev-parse HEAD' 2012-11-07 05:01:24,258 DEBUG Calling 'git merge --no-ff -m merge_into_develop-needs-fixes-conflict-broken: PR 461 (Bugs web sprint2 2) 69a33ae28b78a310d4f471e50f0ae1378088ca90' 2012-11-07 05:01:24,683 DEBUG Auto-merging components/tools/OmeroPy/src/omero/gateway/__init__.py 2012-11-07 05:01:24,683 DEBUG CONFLICT (delete/modify): components/tools/OmeroWeb/omeroweb/webadmin/templates/webadmin/login.html deleted in 69a33ae28b78a310d4f471e50f0ae1378088ca90 and modified in HEAD. Version HEAD of components/tools/OmeroWeb/omeroweb/webadmin/templates/webadmin/login.html left in tree. 2012-11-07 05:01:24,683 DEBUG Removing components/tools/OmeroWeb/omeroweb/webclient/static/webclient/image/logo_login.png 2012-11-07 05:01:24,683 DEBUG Removing components/tools/OmeroWeb/omeroweb/webclient/static/webclient/image/logo_login2.png 2012-11-07 05:01:24,683 DEBUG Auto-merging components/tools/OmeroWeb/omeroweb/webclient/static/webclient/javascript/ome.webclient.actions.js 2012-11-07 05:01:24,683 DEBUG Auto-merging components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/activities/activitiesContent.html 2012-11-07 05:01:24,683 DEBUG Auto-merging components/tools/OmeroWeb/omeroweb/webgateway/views.py 2012-11-07 05:01:24,801 DEBUG Automatic merge failed; fix conflicts and then commit the result. 2012-11-07 05:01:24,806 DEBUG Calling 'git reset --hard 365de9' 2012-11-07 05:01:25,106 DEBUG HEAD is now at 365de93 merge_into_develop-needs-fixes-conflict-broken: PR 460 (Batch remove annotations 9729) 2012-11-07 05:01:25,109 DEBUG Conflicting PR #461.Removed from build OMERO-merge-develop #36.

[will-moore]

Ah - OK, I need to be a bit more thorough with my merging. Thanks for the pointer, I'll have a go at sorting that...

[joshmoore]

@will-moore, I think the PR you needed has now been merged.

[joshmoore]

@will-moore, is anything missing for you to rebase/merge this? It was excluded from today's build.

[will-moore]

When I tried this yesterday it all merged cleanly - I'll have another look today

[bpindelski]

Tested on gretzky. Looks good to merge.