← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/textui.py

  • Committer: Aaron Bentley
  • Date: 2005-09-29 04:59:47 UTC
  • mto: (1393.1.21) (1185.14.1)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: aaron.bentley@utoronto.ca-20050929045947-ff08a7f6578f9657
Conflict handling where OTHER is deleted

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/textui.py
21
21
    if kind == 'directory':
22
22
        # use this even on windows?
23
23
        kind_ch = '/'
 
24
    elif kind == 'symlink':
 
25
        kind_ch = '->'
24
26
    else:
25
 
        assert kind == 'file'
 
27
        assert kind == 'file', ("can't handle file of type %r" % kind)
26
28
        kind_ch = ''
27
29
 
28
30
    assert len(state) == 1