[merge][0.11] Transform._set_mode stats the wrong file

John Arbash Meinel john at arbash-meinel.com
Fri Sep 22 06:03:38 BST 2006


Aaron Bentley wrote:
> John Arbash Meinel wrote:
>>> Well, for now I'll merge it with both tests, but if anyone objects I'll
>>> take a test out.
> 
> It looks as though you only merged your test.
> 
> Aaron

You're right. It seems we have a bug in 'bzr pull'. I'm not sure what
changed, but I'm using a checkout, and I did 'bzr pull' of your branch.
And the local branch shows your revisions, but the master branch shows
the original ancestry.

I thought 'bzr pull' was supposed to update the master branch. Do we
have a regression, or just a change of policy?

Anyway, I merged your changes, committed, and submitted them again.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060922/bac1ae3b/attachment.pgp 


More information about the bazaar mailing list