[MERGE] Fix for bug 285055

[Justyn Butler]

This is a fix for bug #285055
http://bugs.launchpad.net/bzr/+bug/285055

It simply uses

  if (not force) | (control_dir.get_branch_reference().startswith('file://'))

to check whether the force option has been used and whether the branch
reference is on the local file system.
If the force option *has* been used and the branch reference is *not*
on the local file system it will skip checks for uncommitted changes.

Cheers,
Justyn.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bug285055.patch
Type: text/x-patch
Size: 1061 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20081020/fee047fe/attachment.bin