[MERGE] Fix bug #127115, merge --uncommitted failing on a single commit branch

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Wouter van Heyst wrote:
> Hi all,
> 
> this basically undoes part of the r2617 to speed up merge by once again
> checking if other_rev_id is None.
> 
> Wouter van Heyst
> 
> 
> ------------------------------------------------------------------------
> 
> # Bazaar merge directive format 2 (Bazaar 0.19)
> # revision_id: larstiq at larstiq.dyndns.org-20070721141117-\
> #   ogghgpjyh02h8fri
> # target_branch: file:///home/larstiq/src/bzr/bzr.dev/
> # testament_sha1: b48342bf2e0401a8b59291a238a6a6e8cc47b8ba
> # timestamp: 2007-07-21 16:11:55 +0200
> # base_revision_id: pqm at pqm.ubuntu.com-20070720233740-hjfxo6dx2ytwkros
> # 
> # Begin patch
> === modified file 'bzrlib/merge.py'
> --- bzrlib/merge.py	2007-07-20 12:56:33 +0000
> +++ bzrlib/merge.py	2007-07-21 14:11:17 +0000
> @@ -164,7 +164,7 @@
>          self.interesting_files = file_list
>  
>      def set_pending(self):
> -        if not self.base_is_ancestor or not self.base_is_other_ancestor:
> +        if not self.base_is_ancestor or not self.base_is_other_ancestor or self.other_rev_id is None:
>              return
>          self._add_parent()


The only comment I would make is that this line certainly looks longer
than 80 characters, so it should probably be broken up into:

if (not self.base_is_ancestor
    or not self.base_is_other_ancestor
    or self.other_rev_id is None):

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGojbDJdeBCYSNAAMRAuf7AJ9QB6YYCMESWUpslI38NA5+Pw0BaACgsh6+
BUqEgbMwjIPEDbKaPNWaoFA=
=divd
-----END PGP SIGNATURE-----