Merge lp:~pitkali/bzr-scmproj/padd-trace into lp:bzr-scmproj

Proposed by Piotr Kalinowski
Status: Merged
Approved by: Alexander Belchenko
Approved revision: 386
Merge reported by: Alexander Belchenko
Merged at revision: not available
Proposed branch: lp:~pitkali/bzr-scmproj/padd-trace
Merge into: lp:bzr-scmproj
Diff against target: 10 lines (+1/-1)
1 file modified
cli.py (+1/-1)
To merge this branch: bzr merge lp:~pitkali/bzr-scmproj/padd-trace
Reviewer Review Type Date Requested Status
Alexander Belchenko Approve
Review via email: mp+176287@code.launchpad.net

Description of the change

Replaces stray reference to trace.info upon using project-add command that causes ImportError. It seems that trace.info was finally removed in July 2011. It had information to use trace.note instead, so this is what I used.

To post a comment you must log in.
Revision history for this message
Alexander Belchenko (bialix) wrote :

Thank you for your patch.

review: Approve
Revision history for this message
Alexander Belchenko (bialix) wrote :

Your branch has 2a format of repository, while scmproj trunk is still in 1.9 format. This version mismatch prevents me to directly merge your patch. So I manually applied your changes and pushed them to trunk. Thank you for patch.

Revision history for this message
Piotr Kalinowski (pitkali) wrote :

Hmm, that would because I branched trunk into a shared repository using 2a format right? Just checking, as I had, like, a 3-year break from using bzr (it's amazing how Emacs cloning experience improved).

Revision history for this message
Alexander Belchenko (bialix) wrote :

Most likely, yes. You don't need to change anything now.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cli.py'
2--- cli.py 2012-04-13 14:38:38 +0000
3+++ cli.py 2013-07-22 20:56:51 +0000
4@@ -141,7 +141,7 @@
5 add_func(the_name, the_relpath, url)
6 p.save_config()
7 p.ignore_relpath(the_relpath)
8- trace.info('%s "%s" added successfully.' % (kind, the_name))
9+ trace.note('%s "%s" added successfully.' % (kind, the_name))
10 trace.note('To get the local copy of the component use `bzr project-update` command.')
11
12

Subscribers

People subscribed via source and target branches