bzr.log.plugins Reverted blackbox fixes

John A Meinel john at arbash-meinel.com
Thu Feb 16 16:44:42 GMT 2006


Erik Bågfors wrote:
>> My guess is that this happened because you used something like "bzr
>> revert" on bzrlib/tests/blackbox/__init__.py" after doing the merge, and
>> then added your test.
> 
> I think what happened is that I was going to add the tests, opened the
> file, then remembered that blackbox tests weren't working, and merged,
> then saved the file.  Really strange since vim usually tells you that
> the file changed under it.  I suck.
> 
> Anyway, There is a new branch up for your merging pleasure.  I redid
> from the merge to jam-integration.  At
> http://erik.bagfors.nu/bzr.log.plugins. The diff between it and the
> old branch is the reverse of what you have above, so it should be
> fine.
> 
> Sorry for the bother.
> 
> Regards,
> Erik
> 

I checked the diff this time. And it looks clean. So I've merged your
changes, into 1534.

John
=:->


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


More information about the bazaar mailing list