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

  • Committer: Jelmer Vernooij
  • Date: 2009-07-22 13:10:44 UTC
  • mfrom: (0.200.588 trunk)
  • mto: (0.200.597 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20090722131044-r30g8w06xd8f40fl
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
workingtree.py
21
21
from cStringIO import (
22
22
    StringIO,
23
23
    )
24
 
from dulwich.index import (
25
 
    Index,
26
 
    )
27
24
from dulwich.objects import (
28
25
    Blob,
29
26
    )
33
30
from bzrlib import (
34
31
    errors,
35
32
    ignores,
36
 
    inventory,
37
33
    lockable_files,
38
34
    lockdir,
39
35
    osutils,
44
40
    )
45
41
from bzrlib.decorators import (
46
42
    needs_read_lock,
47
 
    needs_write_lock,
48
43
    )
49
44
 
50
45