Merge lp:~jelmer/wikkid/null-revision into lp:wikkid
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Merged at revision: | 40 |
Proposed branch: | lp:~jelmer/wikkid/null-revision |
Merge into: | lp:wikkid |
Diff against target: |
20 lines (+3/-0) 1 file modified
wikkid/filestore/bzr.py (+3/-0) |
To merge this branch: | bzr merge lp:~jelmer/wikkid/null-revision |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Penhey | Approve | ||
Review via email: mp+26075@code.launchpad.net |
Description of the change
This fixes a deprecation warning that is triggered when creating new pages using wikkid from the testsuite.
To post a comment you must log in.
Hi Jelmer,
This makes the test suite fail:
ERROR: wikkid. tests.test_ bzr_filestore. TestBzrFileStor e.test_ updating_ existing_ file ------- ------- ------- ------- ------- ------- ------- ------- ------- /tmp/testbzr- lrpIxX. tmp/wikkid. tests.test_ bzr_filestore. TestBzrFileStor e.test_ updating_ existing_ file/work/ .bzr/. branch. BzrBranchFormat 7 object at 0x39c7090> in file:// /tmp/testbzr- lrpIxX. tmp/wikkid. tests.test_ bzr_filestore. TestBzrFileStor e.test_ updating_ existing_ file/work/ .bzr/ lrpIxX. tmp/wikkid. tests.test_ bzr_filestore. TestBzrFileStor e.test_ updating_ existing_ file/work/ .bzr/checkout/ dirstate' lrpIxX. tmp/wikkid. tests.test_ bzr_filestore. TestBzrFileStor e.test_ updating_ existing_ file/work' lrpIxX. tmp/wikkid. tests.test_ bzr_filestore. TestBzrFileStor e.test_ updating_ existing_ file/home/ .bazaar' lrpIxX. tmp/wikkid. tests.test_ bzr_filestore. TestBzrFileStor e.test_ updating_ existing_ file/work/ lrpIxX. tmp' python2. 6/dist- packages/ testtools/ testcase. py", line 153, in _runCleanups *arguments, **keywordArguments) file:// /tmp/testbzr- lrpIxX. tmp/wikkid. tests.test_ bzr_filestore. TestBzrFileStor e.test_ updating_ existing_ file/work/ .bzr/branch- lock3wtt4kz8cx4 0cwolrim4) , LockResult( file:// /tmp/testbzr- lrpIxX. tmp/wikkid. tests.test_ bzr_filestore. TestBzrFileStor e.test_ updating_ existing_ file/work/ .bzr/repository /locks1n7dza8nc d6g4mpkm3n) , LockResult( file:// /tmp/testbzr- lrpIxX. tmp/wikkid. tests.test_ bzr_filestore. TestBzrFileStor e.test_ updating_ existing_ file/work/ .bzr/branch/ lock00a4oh1pyoq alyn1ojjt) , LockResult( file:// /tmp/testbzr- lrpIxX. tmp/wikkid. tests.test_ bzr_filestore. TestBzrFileStor e.test_ updating_ existing_ file/work/ .bzr/checkout/ lock5i05vu2exls h0iz13bvd) , LockResult( file:// /tmp/testbzr- lrpIxX. tmp/wikkid. tests.test_ bzr_filestore. TestBzrFileStor e.test_ updating_ existing_ file/work/ .bzr/checkout/ lock71m26fqbpsz pruhrzqcj) , LockResult( file:// /tmp/testbzr- lrpIxX. tmp/wikkid. tests.test_ bzr_filestore. TestBzrFileStor e.test_ updating_ existing_ file/work/ .bzr/branch/ lockkai5puavhgt 9w3n950aj) , LockResult( file:// /tmp/testbzr- lrpIxX. tmp/wikkid. tests.test_ bzr_filestore. TestBzrFileStor e.test_ updating_ existing_ file/work/ .bzr/checkout/ lockvho3y2u6zp2 rk7u51gm6) , LockResult( file:// /tmp/testbzr- lrpIxX. tmp/wikkid. tests.test_ bzr_filestore. TestBzrFileStor e.test_ updating_ existing_ file/work/ .bzr/repository /lock452dh8q3ts 2rdxjdagmh) , LockResult( file:// /tmp/testbzr- lrpIxX. tmp/wikkid. tests.test_ bzr_filestore. TestBzrFileStor e.test_ updating_ existing_ file/work/ .bzr/branch/ lockhhtjr77jxj8 6io359ii9) , LockResult( file:// /tmp/tes. ..
-------
Text attachment: log
------------
1.631 creating repository in file://
1.634 creating branch <bzrlib.
1.640 trying to create missing lock '/tmp/testbzr-
1.640 opening working tree '/tmp/testbzr-
1.645 skip control directory '.bzr'
1.645 creating config directory: '/tmp/testbzr-
1.648 preparing to commit
INFO Committing to: /tmp/testbzr-
1.650 Selecting files for commit with filter None
INFO added README
INFO Committed revision 1.
1.668 opening working tree '/tmp/testbzr-
------------
Text attachment: traceback
------------
Traceback (most recent call last):
File "/usr/lib/
function(
AssertionError: Different number of acquired and released or broken locks. ([LockResult(