/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/shelf_ui.py

  • Committer: Aaron Bentley
  • Date: 2008-10-16 21:37:21 UTC
  • mfrom: (0.12.63 shelf-manager)
  • mto: This revision was merged to the branch mainline in revision 3823.
  • Revision ID: aaron@aaronbentley.com-20081016213721-4evccj16q9mb05uf
Merge with shelf-manager

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf_ui.py
26
26
    diff,
27
27
    errors,
28
28
    patches,
 
29
    shelf,
29
30
    textfile,
30
31
    trace,
31
32
    ui,
32
33
    workingtree)
33
34
from bzrlib.plugins.bzrtools import colordiff
34
35
from bzrlib.plugins.bzrtools.userinteractor import getchar
35
 
from bzrlib.plugins.shelf2 import shelf
36
36
 
37
37
 
38
38
class Shelver(object):