Merge lp://staging/~vila/bzr/609186-shortcuts into lp://staging/bzr

sent to pqm by email

sent to pqm by email

sent to pqm by email

Help needed !
It seems that pqm fails some tests (I briefly saw in a summary ~36 failures mentioned) but the email can't reach me. Investigating with a losa seem to point at my ISP marking it as spam :(

I can reproduce the failures even on the hardy babune slave, so I need someone else to feed-pqm this and forward me the pqm email on my canonical address (<my nick> at canonical <dot> com).

Thanks in advance !

If you get a 'Conflict in NEWS' error, that's not the one I'm after, it just means someone landed some more stuff. I just remerge against trunk though so it shouldn't occur again.

sent to pqm by email

I resolved the conflicts in
https://code.edge.launchpad.net/~mbp/bzr/integration/+merge/38166 and
I'll let you know if there are any errors.

There are multiple failures like this:

Traceback (most recent call last):
 File "/usr/lib/python2.4/site-packages/testtools/runtest.py", line 128, in _run_user
   return fn(*args)
 File "/usr/lib/python2.4/site-packages/testtools/testcase.py", line 368, in _run_test_method
   testMethod()
 File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/plugins/launchpad/test_lp_directory.py", line 466, in test_ubuntu_d_distroseries_expansion
   self.assertURL('ubuntu/dapper/foo', 'ubuntu:d/foo', series='dapper')
 File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/plugins/launchpad/test_lp_directory.py", line 383, in assertURL
   self.directory._resolve(shortcut, factory))
 File "/home/pqm/bzr-pqm-workdir/home/+trunk/bzrlib/plugins/launchpad/lp_directory.py", line 77, in _resolve
   if result.scheme in ('ubuntu', 'debianlp'):
AttributeError: 'tuple' object has no attribute 'scheme'

Bah, the babune slave doesn't force the use of python2.4 so I was on the wrong track.

@barry: You will copy 100 times: bzr should remain compatible with python2.4 OR send me a beer ;)

sent to pqm by email