Rev 6286: Remove debug statement, clarify empty list trick. in file:///home/vila/src/bzr/bugs/884270-merge-po/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Mon Nov 28 16:35:08 UTC 2011
At file:///home/vila/src/bzr/bugs/884270-merge-po/
------------------------------------------------------------
revno: 6286
revision-id: v.ladeuil+lp at free.fr-20111128163508-uv7fjnv746o6dgev
parent: v.ladeuil+lp at free.fr-20111128163124-u6ji7qtvcd8lsh80
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 884270-merge-po
timestamp: Mon 2011-11-28 17:35:08 +0100
message:
Remove debug statement, clarify empty list trick.
-------------- next part --------------
=== modified file 'bzrlib/plugins/po_merge/tests/test_po_merge.py'
--- a/bzrlib/plugins/po_merge/tests/test_po_merge.py 2011-11-28 16:31:24 +0000
+++ b/bzrlib/plugins/po_merge/tests/test_po_merge.py 2011-11-28 16:35:08 +0000
@@ -61,7 +61,8 @@
$ bzr branch adduser -rrevid:this work
2>Branched 2 revisions.
$ cd work
-$ bzr config po_merge.po_dirs=dont-exist
+# set po_dirs to an empty list
+$ bzr config po_merge.po_dirs=
$ bzr merge ../adduser -rrevid:other
2> M po/adduser.pot
2> M po/fr.po
@@ -81,7 +82,6 @@
self.run_script("""\
$ bzr config po_merge.po_dirs=po,
""")
- self.debug()
# Use remerge to trigger the hook,
self.run_script("""\
$ bzr remerge po/*.po
More information about the bazaar-commits
mailing list