[MERGE][bug 334028] Mention --force when bzr switch fails to open the current master branch.

[Marius Kruger]

2009/5/7 Jelmer Vernooij <jelmer at vernstok.nl>

> This trivial patch makes ``bzr switch`` mention --force when it fails
> to open the current master branch, as user may want to use it if the
> original master branch has moved.
>
> See bug https://bugs.edge.launchpad.net/bzr/+bug/334028 for a
> background.
>

I get a traceback when trying to switch away from a missing master.
Are you fixing that?
(it does not look so to me, I still get bzr: ERROR:
exceptions.AttributeError: 'str' object has no attribute 'get'
but it seems to be a bzr-svn issue, see trace below)

I also get a traceback trying to switch --force away a lightweight checkout
from a missing master.
I think there is a bug out for that.

some related bugs are:
https://bugs.edge.launchpad.net/bzr/+bug/308798
https://bugs.edge.launchpad.net/bzr/+bug/198821
https://bugs.edge.launchpad.net/bzr/+bug/285055

sorry if this is just noise
regards
marius

--
$ bzr switch branch
bzr: ERROR: exceptions.AttributeError: 'str' object has no attribute 'get'

Traceback (most recent call last):
  File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/commands.py", line 727,
in exception_to_return_code
    return the_callable(*args,
**kwargs)
  File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/commands.py", line 922,
in run_bzr
    ret =
run(*run_argv)

  File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/commands.py", line 559,
in run_argv_aliases
    return
self.run(**all_cmd_args)

  File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/builtins.py", line 5283,
in run
    switch.switch(control_dir, to_branch,
force)
  File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/switch.py", line 37, in
switch
    _set_branch_location(control_dir, to_branch,
force)
  File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/switch.py", line 83, in
_set_branch_location
    if not force and _any_local_commits(b,
possible_transports):
  File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/switch.py", line 106, in
_any_local_commits
    other_branch =
this_branch.get_master_branch(possible_transports)

  File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/decorators.py", line
138, in read_locked
    result = unbound(self, *args,
**kwargs)
  File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/branch.py", line 2391,
in get_master_branch

possible_transports=possible_transports)

  File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/branch.py", line 140, in
open

possible_transports=possible_transports)

  File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/bzrdir.py", line 837, in
open
    return BzrDir.open_from_transport(t,
_unsupported=_unsupported)
  File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/bzrdir.py", line 867, in
open_from_transport

redirected)

  File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/transport/__init__.py",
line 1642, in do_catching_redirections
    return
action(transport)

  File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/bzrdir.py", line 854, in
find_format
    transport,
_server_formats=_server_formats)

  File "/stuph/projects/bzr/bzr.repo/bzr.dev/bzrlib/bzrdir.py", line 1785,
in find_format
    return
format.probe_transport(transport)

  File "/home/amanica/.bazaar/plugins/svn/format.py", line 109, in
probe_transport
    transport =
get_svn_ra_transport(transport)

  File "/home/amanica/.bazaar/plugins/svn/transport.py", line 89, in
get_svn_ra_transport
    ra_transport = SvnRaTransport(bzr_transport.base,
credentials=creds)
  File "/home/amanica/.bazaar/plugins/svn/errors.py", line 130, in
convert
    return unbound(*args,
**kwargs)

  File "/home/amanica/.bazaar/plugins/svn/transport.py", line 260, in
__init__

self.connections.set_credentials(credentials)

  File "/home/amanica/.bazaar/plugins/svn/transport.py", line 213, in
set_credentials
    user =
credentials.get('user')

AttributeError: 'str' object has no attribute 'get'
  svn                  /home/amanica/.bazaar/plugins/svn [0.5.4]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20090507/6b2e3829/attachment.htm