Launchpad itself

Merge lp:~benji/launchpad/update-zope.testing-2 into lp:launchpad

  1. update-zope.testing-2
  2. Merge into devel
Proposed by Benji York
Status: Merged
Approved by: Benji York
Approved revision: 15058
Merge reported by: Benji York
Merged at revision: not available
Proposed branch: lp:~benji/launchpad/update-zope.testing-2
Merge into: lp:launchpad
Diff against target: 27 lines (+7/-1) (has conflicts)
1 file modified
versions.cfg (+7/-1)
Text conflict in versions.cfg
To merge this branch: bzr merge lp:~benji/launchpad/update-zope.testing-2
Reviewer Review Type Date Requested Status
Benji York (community) Approve
Review via email: mp+100798@code.launchpad.net

Commit message

Use the newest version (3.9.4-p6) of our zope.testing fork which fixes bug 972456.

Description of the change

Use the newest version (3.9.4-p6) of our zope.testing fork which fixes bug 972456.

To post a comment you must log in.
Revision history for this message
Benji York (benji) wrote :

Self reviewing.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'versions.cfg'
2--- versions.cfg 2012-04-03 22:08:39 +0000
3+++ versions.cfg 2012-04-04 14:05:27 +0000
4@@ -277,16 +277,22 @@
5 zope.testbrowser = 3.7.0a1
6 # p1 Build of lp:~mars/zope.testing/3.9.4-p1. Fixes bugs 570380 and 587886.
7 # p2 With patch for thread leaks to make them skips, fixes windmill errors
8-# with 'new threads' in hudson/ec2 builds.
9+# with 'new threads' in hudson/ec2 builds.
10 # p3 And always tear down layers, because thats the Right Thing To Do.
11 # p4 fixes --subunit --list to really just list the tests.
12 # p5 Build of lp:~launchpad/zope.testing/3.9.4-p5. Fixes bug #609986.
13+<<<<<<< TREE
14 # p6 reinstates fix from p4. Build of lp:~launchpad/zope.testing/3.9.4-fork
15 # revision 26. To build, use python 2.6, not 2.7.
16 # Run "python bootstrap.py; ./bin/buildout".
17 # Make sure you have subunit installed. When running tests, be aware that
18 # three will fail initially, per http://pastebin.ubuntu.com/913757/ .
19 zope.testing = 3.9.4-p6
20+=======
21+# p6 Build of the new perminant branch lp:~launchpad/zope.testing/3.9.4-fork.
22+# Fixes bug 972456
23+zope.testing = 3.9.4-p6
24+>>>>>>> MERGE-SOURCE
25 zope.thread = 3.4
26 zope.traversing = 3.8.0
27 zope.viewlet = 3.6.1