merged latest fixes from bzr.0.14 branch
John Arbash Meinel
john at arbash-meinel.com
Thu Jan 25 17:04:13 GMT 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Robert Collins wrote:
> On Thu, 2007-01-25 at 11:11 +1100, Martin Pool wrote:
>> On 24 Jan 2007, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
>>> Alexander Belchenko wrote:
>>>> This fixes already in our codebase, so I simply merge them from 0.14 branch to bzr.dev.
>>>> Patch attached.
>>>> I think this lies in category 'trivial fixes' so I did this without merge request.
>>> Unfortunately, this is against policy.
>>>
>>> Policy is that once bzr0.14 branches from bzr.dev, bzr.dev never does a
>>> complete merge from it.
>>>
>>> The divergence is maintained so that it is impossible to accidentally
>>> pull bzr.dev into bzr0.14.
>>>
>>> I think it's an unfortunate policy-- merging the changes in a release
>>> branch into the development branch is an eminently reasonable thing to
>>> do. But it is policy, and until it changes, we should follow it.
>> I think, given the way we work now, this is not worth keeping. Being
>> able to merge across is pretty useful. Does anyone want to keep it?
>
> Yes, because until bzr has a 'mainline on this branch is precious' flag,
> its not unlikely that pull will be done at the wrong time into a release
> branch.
>
>> In doing the merge you should be careful that NEWS entries go into the
>> right place.
>
> That too.
>
> Note that doing a partial merge is really easy: merge;
> rm .bzr/checkout/pending-merges;touch .bzr/checkout/pending-merges
>
> Rob
Well, once we have tags, we can simply tag the right revision.
At that point you *want* to merge in all of your history into your
mainline, because then from mainline you can extract any official
release. (Right now I don't really like 'bzr branch bzr.dev' will not
give me all of the official releases).
Just as a "public service" I've been keeping mirrors of all the official
releases (at least as close as I could find for some of the older ones).
And this is what I have:
bzr.0.0.5 mbp at sourcefrog.net-20050615060316-97b948fb1eade31f
bzr.0.1.0 mbp at sourcefrog.net-20051013032322-dc469f4b81f8e7f9
bzr.0.6.0 mbp at sourcefrog.net-20051028055627-b80f0d7d43d07407
bzr-0.7-fixes mbp at sourcefrog.net-20060120051910-199f6d5e9d1e5c6d
bzr.0.8.2 pqm at pqm.ubuntu.com-20060517071027-58ef74796b918716
bzr.0.9.0 pqm at pqm.ubuntu.com-20060811102108-06a24f3a1d4e7d82
bzr.0.10.0 pqm at pqm.ubuntu.com-20060904005919-d595cc974f859400
bzr.0.11.0 pqm at pqm.ubuntu.com-20061001233254-c3a627b7c1390697
bzr.0.12.0 pqm at pqm.ubuntu.com-20061110203829-b23b986f699765d4
bzr.0.13.0 pqm at pqm.ubuntu.com-20061205000542-47a28e349f4d905a
bzr.0.14.0 pqm at pqm.ubuntu.com-20070123015756-e05d251079a656ca
I'm also going to post these on the wiki somewhere so that we have a
good record of the 'official' releases. It also means it will be pretty
easy to set up the first set of tags whenever we finally merge tag support.
http://bazaar-vcs.org/BzrBranches
As long as we keep a list like this (hey tags), even if one of them gets
accidentally overridden we can just restore it with a 'bzr branch
- -rrevid:XXXX'.
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFFuOMNJdeBCYSNAAMRAkg9AJ9+vX+uc6MW38WwzR4ArGrPLXT6agCgsr/t
ZkkCBkm4njEHrpQKqWRoL5o=
=ERom
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list