/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.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-17 17:57:15 UTC
  • mfrom: (4454 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4460.
  • Revision ID: john@arbash-meinel.com-20090617175715-p9ebpwx5rhc0qin1
Merge bzr.dev 4454 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf.py
19
19
import re
20
20
 
21
21
from bzrlib import (
 
22
    bencode,
22
23
    errors,
23
24
    merge,
24
25
    merge3,
28
29
    ui,
29
30
    workingtree,
30
31
)
31
 
from bzrlib.util import bencode
32
32
 
33
33
 
34
34
class ShelfCreator(object):