openlp-core team mailing list archive

[Phill <phill.ridout@xxxxxxxxx>]

Phill has proposed merging lp:~phill-ridout/openlp/tag_fix into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~phill-ridout/openlp/tag_fix/+merge/240379

lp:~phill-ridout/openlp/tag_fix (revision 2440)
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/742/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/682/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/626/
[SUCCESS] http://ci.openlp.org/job/Branch-04a-Windows_Functional_Tests/565/
[SUCCESS] http://ci.openlp.org/job/Branch-04b-Windows_Interface_Tests/174/
[SUCCESS] http://ci.openlp.org/job/Branch-05a-Code_Analysis/379/
[SUCCESS] http://ci.openlp.org/job/Branch-05b-Test_Coverage/253/

-- 
https://code.launchpad.net/~phill-ridout/openlp/tag_fix/+merge/240379
Your team OpenLP Core is requested to review the proposed merge of lp:~phill-ridout/openlp/tag_fix into lp:openlp.

=== modified file 'tests/utils/test_bzr_tags.py'
--- tests/utils/test_bzr_tags.py	2014-07-14 07:19:47 +0000
+++ tests/utils/test_bzr_tags.py	2014-11-02 17:46:31 +0000
@@ -50,7 +50,8 @@
     ['1.9.11', '2039'],
     ['1.9.12', '2063'],
     ['2.0', '2118'],
-    ['2.1.0', '2119']
+    ['2.1.0', '2119'],
+    ['2.1.1', '2438']
 ]
 # Depending on the repository, we sometimes have the 2.0.x tags in the repo too. They come up with a revision number of
 # "?", which I suspect is due to the fact that we're using shared repositories. This regular expression matches all