Zorba

Merge lp:~zorba-coders/zorba/zdst0006-message into lp:zorba

  1. zdst0006-message
  2. Merge into trunk
Proposed by Ghislain Fourny
Status: Merged
Approved by: Ghislain Fourny
Approved revision: 10995
Merged at revision: 10994
Proposed branch: lp:~zorba-coders/zorba/zdst0006-message
Merge into: lp:zorba
Diff against target: 25 lines (+2/-2)
2 files modified
src/diagnostics/diagnostic_en.xml (+1/-1)
src/diagnostics/pregenerated/dict_en.cpp (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/zdst0006-message
Reviewer Review Type Date Requested Status
Till Westmann Approve
Matthias Brantner Approve
Review via email: mp+120572@code.launchpad.net

Commit message

Specifying collection and property upon ZDST0006.

Description of the change

Specifying collection and property upon ZDST0006.

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/zdst0006-message-2012-08-21T14-21-13.73Z/log.html

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

The attempt to merge lp:~zorba-coders/zorba/zdst0006-message into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job zdst0006-message-2012-08-21T14-21-13.73Z is finished.
  The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

lp:~zorba-coders/zorba/zdst0006-message updated
10995. By Ghislain Fourny

Committing changed pregenerated file.

Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Till Westmann (tillw) :
review: Approve
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/zdst0006-message-2012-08-21T16-17-42.204Z/log.html

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

Validation queue job zdst0006-message-2012-08-21T16-17-42.204Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/diagnostics/diagnostic_en.xml'
2--- src/diagnostics/diagnostic_en.xml 2012-08-16 18:31:02 +0000
3+++ src/diagnostics/diagnostic_en.xml 2012-08-21 15:47:19 +0000
4@@ -2197,7 +2197,7 @@
5 </diagnostic>
6
7 <diagnostic code="ZDST0006" name="COLLECTION_INVALID_PROPERTY_VALUE">
8- <value>collection invalid property value</value>
9+ <value>"$1": invalid annotation for collection "$2"</value>
10 </diagnostic>
11
12 <diagnostic code="ZDST0007" name="COLLECTION_DECL_IN_FOREIGN_MODULE">
13
14=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
15--- src/diagnostics/pregenerated/dict_en.cpp 2012-08-16 18:31:02 +0000
16+++ src/diagnostics/pregenerated/dict_en.cpp 2012-08-21 15:47:19 +0000
17@@ -368,7 +368,7 @@
18 { "ZDST0002", "\"$1\": collection already imported into module \"$2\"" },
19 { "ZDST0003", "\"$1\": collection declaration not allowed in main module" },
20 { "ZDST0004", "collection multiple property values" },
21- { "ZDST0006", "collection invalid property value" },
22+ { "ZDST0006", "\"$1\": invalid annotation for collection \"$2\"" },
23 { "ZDST0007", "\"$1\": collection declaration in foreign module" },
24 { "ZDST0021", "\"$1\": index already declared" },
25 { "ZDST0022", "\"$1\": index already imported into module \"$2\"" },

Subscribers

People subscribed via source and target branches