bzr-email-notifier

Merge lp://qastaging/~whitelynx/bzr-email-notifier/logging-cleanup into lp://qastaging/bzr-email-notifier

logging-cleanup
Merge into trunk

Proposed by David H. Bronke on 2011-06-21

Status:	Merged
Merged at revision:	114
Proposed branch:	lp://qastaging/~whitelynx/bzr-email-notifier/logging-cleanup
Merge into:	lp://qastaging/bzr-email-notifier
Diff against target:	766 lines (+214/-185) 2 files modified bzr_email_notifier.py (+127/-121) configuration.py (+87/-64)
To merge this branch:	bzr merge lp://qastaging/~whitelynx/bzr-email-notifier/logging-cleanup
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Nicholas Allen		2011-06-21	Pending
Review via email: mp+65406@code.qastaging.launchpad.net

Description of the change

Converted to use logging instead of 'print' statements and fixed numerous PEP 8 style issues.

Revision history for this message

Nicholas Allen (nick-allen) wrote on 2011-06-22:

This looks good and I'm trying to merge but it seems that you could be using an old Bazaar format for your branch. When I do bzr merge lp:~whitelynx/bzr-email-notifier/logging-cleanup I get this error:

Doing on-the-fly conversion from RemoteRepositoryFormat(_network_name='Bazaar repository format 2a (needs bzr 1.16 or later)\n') to RepositoryFormatKnitPack1().
This may take some time. Upgrade the repositories to the same format for better performance.
bzr: ERROR: KnitPackRepository('file:///home/nick/projects/bzr-email-notifier/.bzr/repository/')
is not compatible with
RemoteRepository(bzr+ssh://bazaar.launchpad.net/~whitelynx/bzr-email-notifier/logging-cleanup/.bzr/)
different rich-root support

Any idea how I can fix this? Do you need to upgrade your branch format?

Revision history for this message

David H. Bronke (whitelynx) wrote on 2011-06-23:

Actually, from the error message, it looks like your repository is the older of the two... KnitPack is an older format that's been superseded by format 2a. You can upgrade your repo using 'bzr upgrade'.