merged latest fixes from bzr.0.14 branch

[Robert Collins]

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
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070125/c68e99c8/attachment-0001.pgp