← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/add.py

  • Committer: John Arbash Meinel
  • Date: 2005-12-01 17:11:25 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-20051201171125-5e1f0970246c4925
Updated the bzr sourcecode to use bzrlib.osutils.pathjoin rather than os.path.join to enforce internal use of / instead of \

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/add.py
137
137
 
138
138
        if kind == 'directory' and recurse and not sub_tree:
139
139
            for subf in os.listdir(af):
140
 
                subp = os.path.join(rf, subf)
 
140
                subp = bzrlib.osutils.pathjoin(rf, subf)
141
141
                if subf == bzrlib.BZRDIR:
142
142
                    mutter("skip control directory %r", subp)
143
143
                elif tree.is_ignored(subp):