← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/add.py

  • Committer: Robert Collins
  • Date: 2006-01-02 22:37:32 UTC
  • mfrom: (1185.50.33 bzr-jam-integration)
  • Revision ID: robertc@robertcollins.net-20060102223732-d5221b37ff0f7888
Merge in John Meinels integration branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/add.py
151
151
 
152
152
        if kind == 'directory' and recurse and not sub_tree:
153
153
            for subf in os.listdir(af):
154
 
                subp = os.path.join(rf, subf)
 
154
                subp = bzrlib.osutils.pathjoin(rf, subf)
155
155
                if subf == bzrlib.BZRDIR:
156
156
                    mutter("skip control directory %r", subp)
157
157
                else: