← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: John Arbash Meinel
  • Date: 2005-12-01 17:53:57 UTC
  • mto: (1185.50.19 bzr-jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1532.
  • Revision ID: john@arbash-meinel.com-20051201175357-afaa3b6ded6cb81c
Couple small fixes, all tests pass on cygwin.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
500
500
        # to branch anymore.
501
501
        raise NotBranchError("path %r is not within branch %r" % (rp, base))
502
502
 
503
 
    return pathjoin(*s)
 
503
    if s:
 
504
        return pathjoin(*s)
 
505
    else:
 
506
        return ''
504
507
 
505
508
 
506
509