[MERGE] trivial bugfix for 0.10

[John Arbash Meinel]

Robert Collins wrote:
> cmd_update can throw failure-to-unlock warnings if pending_merges fails:
> 
> 
> === modified file 'bzrlib/builtins.py'
> --- bzrlib/builtins.py  2006-08-16 16:33:11 +0000
> +++ bzrlib/builtins.py  2006-08-25 01:01:22 +0000
> @@ -822,9 +822,9 @@
>      def run(self, dir='.'):
>          tree = WorkingTree.open_containing(dir)[0]
>          tree.lock_write()
> -        existing_pending_merges = tree.pending_merges()
>          try:
> -            last_rev = tree.last_revision() 
> +            existing_pending_merges = tree.pending_merges()
> +            last_rev = tree.last_revision()
>              if last_rev == tree.branch.last_revision():
>                  # may be up to date, check master too.
>                  master = tree.branch.get_master_branch()
> 
> 
> 
> Seeking a +1 
> 
> -Rob

+1 (Though it looks funny because you also fixed the whitespace error)

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060824/a2e4d9a3/attachment.pgp