/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Andrew Bennetts
  • Date: 2009-11-23 07:10:47 UTC
  • mto: (4634.101.4 2.0)
  • mto: This revision was merged to the branch mainline in revision 4857.
  • Revision ID: andrew.bennetts@canonical.com-20091123071047-j7dsqlla7ruved30
https://launchpad.net/bugs/423563
Fix traceback when doing 'bzr push --use-existing-dir' into a dir with an invalid .bzr directory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.py
93
93
        except errors.FileExists:
94
94
            if not use_existing_dir:
95
95
                raise errors.BzrCommandError("Target directory %s"
96
 
                     " already exists, but does not have a valid .bzr"
 
96
                     " already exists, but does not have a .bzr"
97
97
                     " directory. Supply --use-existing-dir to push"
98
98
                     " there anyway." % location)
 
99
            raise errors.BzrCommandError(
 
100
                "Target directory %s already contains a .bzr directory."
 
101
                % location)
99
102
        except errors.NoSuchFile:
100
103
            if not create_prefix:
101
104
                raise errors.BzrCommandError("Parent directory of %s"