Rev 5960: Nitpicks. in file:///home/vila/src/bzr/reviews/merge-into-empty-fixups/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/reviews/merge-into-empty-fixups/

------------------------------------------------------------
revno: 5960
revision-id: v.ladeuil+lp at free.fr-20110610081144-9g1gppbjok4z8mxf
parent: v.ladeuil+lp at free.fr-20110610075152-9e1wzb9t0qt7a8xw
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: merge-into-empty-fixups
timestamp: Fri 2011-06-10 10:11:44 +0200
message:
  Nitpicks.
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_update.py'
--- a/bzrlib/tests/blackbox/test_update.py	2011-06-09 18:46:24 +0000
+++ b/bzrlib/tests/blackbox/test_update.py	2011-06-10 08:11:44 +0000
@@ -143,8 +143,6 @@
         master.commit('first commit')
         # make a bound branch
         self.run_bzr('checkout master child')
-        # get an object form of child
-        child = workingtree.WorkingTree.open('child')
         # check that out
         self.run_bzr('checkout --lightweight child checkout')
         # get an object form of the checkout to manipulate
@@ -159,6 +157,8 @@
         a_file = file('child/file_b', 'wt')
         a_file.write('Foo')
         a_file.close()
+        # get an object form of child
+        child = workingtree.WorkingTree.open('child')
         child.add(['file_b'])
         child_tip = child.commit('add file_b', local=True)
         # check checkout

=== modified file 'bzrlib/tests/test_reconfigure.py'
--- a/bzrlib/tests/test_reconfigure.py	2011-06-09 18:46:24 +0000
+++ b/bzrlib/tests/test_reconfigure.py	2011-06-10 08:11:44 +0000
@@ -48,7 +48,7 @@
         tree = self.make_branch_and_tree('tree')
         tree.commit('unchanged')
         other_tree = tree.bzrdir.sprout('other').open_workingtree()
-        other_tree.commit('file added')
+        other_tree.commit('mergeable commit')
         tree.merge_from_branch(other_tree.branch)
         reconfiguration = reconfigure.Reconfigure.to_branch(tree.bzrdir)
         self.assertRaises(errors.UncommittedChanges, reconfiguration.apply)