/b-gtk/fix-viz

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to merge.py

Committer: Aaron Bentley
Date: 2007-08-16 14:31:02 UTC
Revision ID: abentley@panoramicfeedback.com-20070816143102-27yzfhdgdv3ggo6e

Fix hue selection to use author in gannotate

files added:
HACKING

NEWS

about.py

bazaar-properties.desktop

bzr-notify.desktop

conflicts.py

history.py

initialize.py

mergedirective.py

missing.py

notify.py

olive.gladep

preferences.py

revidbox.py

revisionmenu.py

tags.py

tests/test_diff.py

tests/test_history.py

tests/test_tortoise_bzr.py

tests/test_viz.py

tortoise-bzr.py

files removed:
po/hu.po

viz/bzrkapp.py

files renamed:
oliveicon2.png => icons/oliveicon2.png

olive/status.py => status.py

files modified:
.bzrignore

README

TODO

__init__.py

annotate/__init__.py

annotate/colormap.py

annotate/gannotate.py

branch.py

checkout.py

cmenu.ui

commit.py

dialog.py

diff.py

errors.py

genpot.sh

icons/commit.png

icons/commit16.png

icons/diff.png

icons/diff16.png

icons/log.png

icons/log16.png

icons/olive-gtk.png

icons/pull.png

icons/pull16.png

icons/push.png

icons/push16.png

icons/refresh.png

logview.py

merge.py

nautilus-bzr.py

olive-gtk

olive-gtk.desktop

olive.glade

olive/__init__.py

olive/guifiles.py

olive/info.py

olive/info_helper.py

olive/menu.py

olive/mkdir.py

olive/rename.py

po/olive-gtk.pot

push.py

revbrowser.py

setup.py

tests/__init__.py

tests/test_preferences.py

ui.py

viz/branchwin.py

viz/graph.py

Show diffs side-by-side

added added

removed removed

28

28

from bzrlib.branch import Branch

29

29

import bzrlib.errors as errors

30

30

31

from olive.dialog import error_dialog, info_dialog, warning_dialog

31

from dialog import error_dialog, info_dialog, warning_dialog

32

32

from errors import show_bzr_error

33

33

from olive.guifiles import GLADEFILENAME

34

34

Older »