← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Patch Queue Manager
  • Date: 2012-01-23 15:31:35 UTC
  • mfrom: (6443.1.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20120123153135-8v3r3z1lx055vmpl
(jelmer) Merge the 2.5 series branch. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.py
92
92
                revision_id=revision_id, stacked_on=stacked_on,
93
93
                create_prefix=create_prefix, use_existing_dir=use_existing_dir,
94
94
                no_tree=no_tree)
 
95
        except errors.AlreadyControlDirError, err:
 
96
            raise errors.BzrCommandError(gettext(
 
97
                "Target directory %s already contains a .bzr directory, "
 
98
                "but it is not valid.") % (location,))
95
99
        except errors.FileExists, err:
96
 
            if err.path.endswith('/.bzr'):
97
 
                raise errors.BzrCommandError(gettext(
98
 
                    "Target directory %s already contains a .bzr directory, "
99
 
                    "but it is not valid.") % (location,))
100
100
            if not use_existing_dir:
101
101
                raise errors.BzrCommandError(gettext("Target directory %s"
102
102
                     " already exists, but does not have a .bzr"