some bzr and pqm questions?

[Fanelli, Paul]

> -----Original Message-----
> From: Jelmer Vernooij [mailto:jelmer at samba.org]
> Sent: Wednesday, March 11, 2009 3:12 PM
> To: Fanelli, Paul
> Subject: Re: some bzr and pqm questions?
> 
> Fanelli, Paul wrote:
> > Jelmer,
> >
> > I am now running bzr 1.13rc1, bzr-svn 0.5.3 and still running pqm
1.3.
> >
> > Have you seen this error?
> >
> > autotest at cuda:~/pqm-queue$ pqm -v -d --run
> > pqm [-1210427200] INFO: found groups {'staff': []}
> > pqm [-1210427200] INFO: group staff has members
> > ['pfanelli at crossbeamsys.com']
> > pqm [-1210427200] INFO: managing branch(s):
> > file:///users/autotest/bzr-testrepo/automation
> > pqm [-1210427200] INFO: creating lockfile
> > pqm [-1210427200] INFO: trying script
> > /users/autotest/pqm-queue/patch.1236800800
> > pqm [-1210427200] INFO: recieved email from Paul Fanelli
> > <pfanelli at crossbeamsys.com>
> > pqm [-1210427200] INFO: garh E9549BE18D6BCE0C :
> > pfanelli at crossbeamsys.com
> > pqm [-1210427200] INFO: sender: Paul Fanelli
<pfanelli at crossbeamsys.com>
> > pqm [-1210427200] INFO: subject: commit test2.txt, try #1
> > pqm [-1210427200] INFO: parsing commands
> > pqm [-1210427200] INFO: cleaning working directory
> > in here
> > pqm [-1210427200] INFO: current cwd is /users/autotest/pqm-queue
> > pqm [-1210427200] INFO: getting working dir for
> > file:///users/autotest/bzr-testrepo/automation
> > pqm [-1210427200] INFO: Executing star-merge
> > file:///users/autotest/bzr-public/work at Wed Mar 11 15:47:27 2009
> > pqm [-1210427200] INFO: running precommit hook:
> > /users/autotest/precommit_hook.sh
> > pqm [-1210427200] INFO: success: merge
> > file:///users/autotest/bzr-public/work
> > file:///users/autotest/bzr-testrepo/automation
> > No handlers could be found for logger "bzr"
> > Traceback (most recent call last):
> >   File "/usr/local/bin/pqm", line 245, in <module>
> >     manager.run(script_queue)
> >   File "/usr/lib/python2.5/site-packages/pqm/core.py", line 107, in
run
> >     self.do_run_mode(script_queue)
> >   File "/usr/lib/python2.5/site-packages/pqm/core.py", line 118, in
> > do_run_mode
> >     script_queue.next_script(), goodscripts, badscripts)
> >   File "/usr/lib/python2.5/site-packages/pqm/core.py", line 147, in
> > run_one_script
> >     (successes, unrecognized, output) = script.run()
> >   File "/usr/lib/python2.5/site-packages/pqm/script.py", line 249,
in
> > run
> >     command_result = command.run()
> >   File "/usr/lib/python2.5/site-packages/pqm/script.py", line 677,
in
> > run
> >     line='merge %s %s' % (self.from_branch, self.to_branch))
> >   File "/usr/lib/python2.5/site-packages/pqm/script.py", line 427,
in
> > do_merge
> >     self.get_vcs().commit(sender, dir, self.commitmsg,
to_repo_revision,
> > config)
> >   File "/usr/lib/python2.5/site-packages/pqm/__init__.py", line 389,
in
> > commit
> >     tree.commit(summary, verbose=False)
> >   File "<string>", line 4, in commit_write_locked
> >   File "/usr/lib/python2.5/site-packages/bzrlib/workingtree_4.py",
line
> > 224, in commit
> >     result = WorkingTree3.commit(self, message, revprops, *args,
> > **kwargs)
> >   File "<string>", line 4, in commit_write_locked
> >   File "/usr/lib/python2.5/site-packages/bzrlib/mutabletree.py",
line
> > 208, in commit
> >     *args, **kwargs)
> >   File "/usr/lib/python2.5/site-packages/bzrlib/commit.py", line
300, in
> > commit
> >     self._check_bound_branch(possible_master_transports)
> >   File "/usr/lib/python2.5/site-packages/bzrlib/commit.py", line
462, in
> > _check_bound_branch
> >     possible_master_transports)
> >   File "<string>", line 4, in get_master_branch_read_locked
> >   File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line
2155,
> > in get_master_branch
> >     possible_transports=possible_transports)
> >   File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line
126, in
> > open
> >     return control.open_branch(_unsupported)
> >   File
"/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/remote.py",
> > line 185, in open_branch
> >     from bzrlib.plugins.svn.branch import SvnBranch
> >   File
"/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/branch.py",
> > line 31, in <module>
> >     from bzrlib.branch import (
> > ImportError: cannot import name InterBranch
> >
> > I remember reading/seeing this somewhere.  Like I need to patch bzr?
How
> > do I fix this?
> 
> 
> It looks like you're not actually running bzr 1.13, or are running a
> snapshot of bzr.dev that's too old.

Yep, I had something pointing over to bzr 1.12. I decided to download
and install bzr 1.13rc1. I re-ran it and it works like a charm, and it
looks like it is twice and fast committing back into svn.  It took a
little more than 4 minutes!  Frackin awesome.

Now, I just have to figure out how to get the actual author of the
change instead of the pqm user to display on a svn log.  I was reading
thru your FAQ and I think I see something that will do this.  The entry:

'Is it possible to keep the author name when pushing changes into
Subversion?'

Is this feature available for svn server 1.4.2?  Or will it only work on
1.5?  

I have been trying to get our Release Eng group to upgrade svn to 1.5,
but they just laugh at me when I ask :).

> 
> > Oh, by the way, that other problem I sent you wasn't a problem with
the
> > bzr/bzr-svn SW, but a by-product of a network glitch we had at work.
I
> > tried to reproduce the problem, and the bzr/bzr-svn SW worked
> > flawlessly. I could commit new/updated changes from bzr into svn
over
> > and over with no problems.
> >
> > Then I decided to give the new code a try and now I am getting the
> > InterBranch issue.
> >
> > Oh, should I be emailing you directly, or should I have emailed the
> > bazaar list?
> Mailing the list and CC-ing me is probably best, that way others can
> comment in as well and any issues we discuss are documented in the
> archives for other people that run into them.
Will do!

> 
> Cheers,
> 
> Jelmer

Thx for all of the help!

-p