[MERGE] Fix version in dev7 string

[John Arbash Meinel]

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

Jelmer Vernooij wrote:
> On Fri, Jun 05, 2009 at 08:39:21AM -0400, Aaron Bentley wrote:
>> Jelmer Vernooij wrote:
>>> The development7 format string mentions being support in bzr 1.15, but
>>> it'll only be part of bzr 1.16.
> 
>> The target and base revisions of this merge directive are the same, so
>> you're not asking for anything to be merged.
> 
>> The target revision is
>> 'jelmer at samba.org-20090605122104-3oppcvuy5809luqt'.  It's not present in
>> bzr.dev, but there's no way to install it.  The bundle is empty.  The
>> target branch, /home/jelmer/bzr/bzr.dev, is not publicly-accessible.
> Sorry about that. The updated patch should be better.
> 
> Cheers,
> 
> Jelmer
> 

- -        if not getattr(target_format, 'supports_tree_reference', False):
+        if (self.supports_tree_reference and
+            not getattr(target_format, 'supports_tree_reference', False)):

^- I'm not entirely sure why this is being brought in by this patch.
Certainly it seems a bit more serious, and thus should have tests.


The rest seems fine.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkopUWoACgkQJdeBCYSNAAMe4wCeKETyndCPgoKyr2llsx5+CyY5
YDYAn2Q1UVRJ0aMpLFDCFZAw3YZakS80
=f/oA
-----END PGP SIGNATURE-----