Rev 4481: Fix typos and add NEWS entry. in file:///home/vila/src/bzr/reviews/branch-into-existing/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/reviews/branch-into-existing/

------------------------------------------------------------
revno: 4481
revision-id: v.ladeuil+lp at free.fr-20090701152531-mrqb7h2bwuoxxckh
parent: bialix at ukr.net-20090626050441-srk5wg2nmwiy7do1
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: branch-into-existing
timestamp: Wed 2009-07-01 17:25:31 +0200
message:
  Fix typos and add NEWS entry.
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-06-25 17:36:29 +0000
+++ b/NEWS	2009-07-01 15:25:31 +0000
@@ -35,6 +35,10 @@
 * ``Branch.set_append_revisions_only`` now works with branches on a smart
   server. (Andrew Bennetts, #365865)
 
+* By default, ``bzr branch`` will fail if the target directory exists, but
+  does not already have a control directory.  The flag ``--use-existing-dir``
+  will allow operation to proceed.  (Alexander Belchenko, #307554)
+
 * ``bzr ls DIR --from-root`` now shows only things in DIR, not everything.
   (Ian Clatworthy)
 

=== modified file 'bzrlib/tests/blackbox/test_branch.py'
--- a/bzrlib/tests/blackbox/test_branch.py	2009-06-26 05:04:41 +0000
+++ b/bzrlib/tests/blackbox/test_branch.py	2009-07-01 15:25:31 +0000
@@ -115,11 +115,11 @@
 
     def test_branch_into_existing_dir(self):
         self.example_branch('a')
-        # exisitng dir with similar files
-        os.mkdir('b')
+        # existing dir with similar files but no .bzr dir
+        self.build_tree_contents([('b/',)])
         self.build_tree_contents([('b/hello', 'bar')])  # different content
-        self.build_tree_contents([('b/goodbye', 'baz')])# the same content
-        # without --use-exisitng-dir it fails
+        self.build_tree_contents([('b/goodbye', 'baz')])# same content
+        # fails without --use-existing-dir
         out,err = self.run_bzr('branch a b', retcode=3)
         self.assertEqual('', out)
         self.assertEqual('bzr: ERROR: Target directory "b" already exists.\n',