Code review comment for lp://staging/~thumper/launchpad/disable-import-auto-upgrade

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

-----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):
> + # 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):

bug abc? :)

> - def test_pullUpgradesFormat(self):
> + def disabled_test_pullUpgradesFormat(self):

Would be good to have a similar XXX here.

Otherwise, looks good.

 review approve

Cheers,
mwh

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

iEYEARECAAYFAkqy2hgACgkQeTTOPm7A7kgp/QCeJadBid7zcH9MqsnAu9bZD48x
FTMAnRdAc6/UyWWM9ErHv8GtfQGfMDlY
=ZF8d
-----END PGP SIGNATURE-----

review: Approve

« Back to merge proposal