Rev 5963: Put the empty lines in the right file ; ) in file:///home/vila/src/bzr/bugs/795456-eager-test/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/795456-eager-test/

------------------------------------------------------------
revno: 5963
revision-id: v.ladeuil+lp at free.fr-20110613143213-zwpns3a64qnhrpol
parent: v.ladeuil+lp at free.fr-20110610114634-vig6o6cos14o0odt
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 795456-eager-test
timestamp: Mon 2011-06-13 16:32:13 +0200
message:
  Put the empty lines in the right file ;)
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_merge.py'
--- a/bzrlib/tests/blackbox/test_merge.py	2011-06-10 11:46:34 +0000
+++ b/bzrlib/tests/blackbox/test_merge.py	2011-06-13 14:32:13 +0000
@@ -689,6 +689,7 @@
         self.assertEqual('rev-2a', target.tags.lookup_tag('tag-a'))
         target.repository.get_revision('rev-2a')
 
+
 class TestMergeRevisionRange(tests.TestCaseWithTransport):
 
     scenarios = (('whole-tree', dict(context='.')),

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-06-10 11:46:34 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-06-13 14:32:13 +0000
@@ -106,8 +106,6 @@
   and rewrite it as a parameterized test to avoid unrelated failures.
   (Vincent Ladeuil, #795456)
 
-
-
 * Show log file contents from subprocesses started by
   `start_bzr_subprocess` in test failure details.  This may help diagnose
   strange hangs and failures involving subprocesses.  (Andrew Bennetts)