[MERGE][Bug 194716] Implement pull --local

[Ian Clatworthy]

Ian Clatworthy has voted tweak.
Status is now: Conditionally approved
Comment:
The following comment in the tests is wrong ...

# now pull, which should update both checkout and master.

I'll tweak and merge.

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3Cc28763af0902261345o26c76fd8mf5abab474e15c595%40mail.gmail.com%3E
Project: Bazaar