> Also, after moving the methods out of the puller/worker into bzrutils, I couldn't use them in the tests anyway as I didn't have two branches to compare to.
>
> This branch will disable the automatic upgrades of the import branches, and disables the tests for it too.
>
> The branch also adds a test and a fix for pushing divergant branches.
Two comments:
> - if bzr_dir.needs_format_conversion(format=required_format):
> + # XXX Tim Penhey 2009-09-18 bug abc Automatic upgrade of import
> + # branches disabled. Need an orderly upgrade process.
> + if False and bzr_dir.needs_format_conversion(format=required_format):
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Tim Penhey wrote:
> Tim Penhey has proposed merging lp:~thumper/launchpad/disable-import-auto-upgrade into lp:launchpad/devel.
>
> Requested reviews:
> Michael Hudson (mwhudson)
>
> This branch will include the approved bzr 2.0 changes :-(
Generally looks nice.
> Also, after moving the methods out of the puller/worker into bzrutils, I couldn't use them in the tests anyway as I didn't have two branches to compare to.
>
> This branch will disable the automatic upgrades of the import branches, and disables the tests for it too.
>
> The branch also adds a test and a fix for pushing divergant branches.
Two comments:
> - if bzr_dir. needs_format_ conversion( format= required_ format) : needs_format_ conversion( format= required_ format) :
> + # XXX Tim Penhey 2009-09-18 bug abc Automatic upgrade of import
> + # branches disabled. Need an orderly upgrade process.
> + if False and bzr_dir.
bug abc? :)
> - def test_pullUpgrad esFormat( self): test_pullUpgrad esFormat( self):
> + def disabled_
Would be good to have a similar XXX here.
Otherwise, looks good.
review approve
Cheers,
mwh
-----BEGIN PGP SIGNATURE----- enigmail. mozdev. org
y2hgACgkQeTTOPm 7A7kgp/ QCeJadBid7zcH9M qsnAu9bZD48x UyWWM9ErHv8GtfQ GfMDlY
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAkq
FTMAnRdAc6/
=ZF8d
-----END PGP SIGNATURE-----