-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Robert Collins wrote: > Robert Collins has proposed merging lp:~lifeless/bzr/bug-375013 into lp:bzr. > > > === modified file 'bzrlib/__init__.py' - --- bzrlib/__init__.py 2009-07-20 11:27:05 +0000 +++ bzrlib/__init__.py 2009-08-11 03:02:56 +0000 @@ -50,7 +50,7 @@ # Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a # releaselevel of 'dev' for unreleased under-development code.
- -version_info = (1, 18, 0, 'dev', 0) +version_info = (2, 0, 0, 'dev', 0)
^- So is this official then?
Certainly it seems spurious to bring this in as part of the rest of the patch.
Especially given that you didn't bump "api_minimum_version" so I don't see why it is relevant.
But hey, if we are officially doing it, then it doesn't really matter.
Anyway, if we are going to be rejecting commit, then we probably should open another bug about:
"bzr merge BUNDLE" doesn't honor stacking invariants in stacked repository, and do a similar "reject if local repository is stacked".
John =:-> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (Cygwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAkqBhUIACgkQJdeBCYSNAANZqQCggLCnR404ukng6cI2Cjn13cMp sUIAoJJC3NO/V8JkbJqdgmrsIrq1mGZX =8TWr -----END PGP SIGNATURE-----
« Back to merge proposal
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Robert Collins wrote: __init_ _.py'
> Robert Collins has proposed merging lp:~lifeless/bzr/bug-375013 into lp:bzr.
>
>
>
=== modified file 'bzrlib/
- --- bzrlib/__init__.py 2009-07-20 11:27:05 +0000
+++ bzrlib/__init__.py 2009-08-11 03:02:56 +0000
@@ -50,7 +50,7 @@
# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
# releaselevel of 'dev' for unreleased under-development code.
- -version_info = (1, 18, 0, 'dev', 0)
+version_info = (2, 0, 0, 'dev', 0)
^- So is this official then?
Certainly it seems spurious to bring this in as part of the rest of the
patch.
Especially given that you didn't bump "api_minimum_ version" so I don't
see why it is relevant.
But hey, if we are officially doing it, then it doesn't really matter.
Anyway, if we are going to be rejecting commit, then we probably should
open another bug about:
"bzr merge BUNDLE" doesn't honor stacking invariants in stacked
repository, and do a similar "reject if local repository is stacked".
John enigmail. mozdev. org/
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAkq BhUIACgkQJdeBCY SNAANZqQCggLCnR 404ukng6cI2Cjn1 3cMp V8JkbJqdgmrsIrq 1mGZX
sUIAoJJC3NO/
=8TWr
-----END PGP SIGNATURE-----