Code review comment for lp:~lifeless/python-oops-tools/deps

The attempt to merge lp:~lifeless/python-oops-tools/deps into lp:python-oops-tools failed.Below is the output from the failed tests.

find . -type f -name '*.py[co]' -exec rm -f {} \;
rm -f bin/buildout
rm -f src/oopstools/settings.py
bzr clean-tree --unknown --force
bzr up download-cache

W: line 3 [buildbot-staging]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 1 [pqm]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
W: line 2 [pqm-oops-tools]: Deprecated key 'location' used
I: This option will be removed in the future; please update your configuration
I: [pqm-oops-tools chroot] Running command: "cd /home/pqm/pqm-workdir/oops-tools && make check"
Nothing to delete.
+N django-1.3.tar.gz
Conflict adding file django-1.3.tar.gz. Moved existing file to django-1.3.tar.gz.moved.
1 conflicts encountered.
Updated to revision 418 of branch http://bazaar.launchpad.net/~launchpad/lp-source-dependencies/trunk
make: *** [bin/buildout] Error 1