Merge lp:~andrewsomething/bzr-gtk/bts-545730 into lp:bzr-gtk/gtk2

Proposed by Andrew Starr-Bochicchio
Status: Merged
Merged at revision: not available
Proposed branch: lp:~andrewsomething/bzr-gtk/bts-545730
Merge into: lp:bzr-gtk/gtk2
Diff against target: 12 lines (+1/-1)
1 file modified
olive/menu.py (+1/-1)
To merge this branch: bzr merge lp:~andrewsomething/bzr-gtk/bts-545730
Reviewer Review Type Date Requested Status
Martin Albisetti (community) Approve
Review via email: mp+17985@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

Context menu entry for "Commit" fails with:

$ olive-gtk
Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/gtk/olive/menu.py", line 285, in commit
    from commit import CommitDialog
ImportError: No module named commit

Patch from Mathias Brodala in Debian BTS. See:

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=545730

Revision history for this message
Martin Albisetti (beuno) wrote :

Thanks for the fix, I'll merge right away.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'olive/menu.py'
2--- olive/menu.py 2009-05-04 20:06:58 +0000
3+++ olive/menu.py 2010-01-25 02:05:22 +0000
4@@ -282,7 +282,7 @@
5
6 def commit(self, action):
7 """ Right context menu -> Commit """
8- from commit import CommitDialog
9+ from bzrlib.plugins.gtk.commit import CommitDialog
10 branch = None
11 try:
12 wt, path = WorkingTree.open_containing(self.path)

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: