Zorba

Merge lp:~nbrinza/zorba/error-messages into lp:zorba

  1. error-messages
  2. Merge into trunk
Proposed by Nicolae Brinza
Status: Superseded
Proposed branch: lp:~nbrinza/zorba/error-messages
Merge into: lp:zorba
Diff against target: 12 lines (+2/-0)
1 file modified
src/compiler/translator/translator.cpp (+2/-0)
To merge this branch: bzr merge lp:~nbrinza/zorba/error-messages
Reviewer Review Type Date Requested Status
Zorba Coders Pending
Review via email: mp+148300@code.launchpad.net

Commit message

Test merge to check the new FOTS remote queue.

Description of the change

Test merge to check the new FOTS remote queue.

To post a comment you must log in.
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2013-02-13T19-34-50.26Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job error-messages-2013-02-13T19-34-50.26Z is finished. The final status was:

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Pending.

Revision history for this message
Chris Hillery (ceejatec) wrote :

Nicolae, is this proposal still necessary? If not, please mark it "Rejected".

lp:~nbrinza/zorba/error-messages updated
10853. By Nicolae Brinza

Merged with Zorba trunk

10854. By Nicolae Brinza

Merged with Zorba trunk

10855. By Nicolae Brinza

Fixed bugs #1210320 and #1212423 - misplaced compiler error

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/compiler/translator/translator.cpp'
2--- src/compiler/translator/translator.cpp 2013-02-09 00:26:52 +0000
3+++ src/compiler/translator/translator.cpp 2013-02-13 19:33:27 +0000
4@@ -15,6 +15,8 @@
5 */
6 #include "stdafx.h"
7
8+// TODO: remove this line. Added just to test the new FOTS remote queue.
9+
10 #include <sstream>
11 #include <iterator>
12 #include <stack>

Subscribers

People subscribed via source and target branches