← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Merge integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
235
235
            if path.find('://') != -1:
236
236
                raise NotBranchError(path=path)
237
237
        path = abspath(path)
 
238
        orig_path = path[:]
238
239
        tail = u''
239
240
        while True:
240
241
            try:
249
250
            path = os.path.dirname(path)
250
251
            if lastpath == path:
251
252
                # reached the root, whatever that may be
252
 
                raise NotBranchError(path=path)
 
253
                raise NotBranchError(path=orig_path)
253
254
 
254
255
    def __iter__(self):
255
256
        """Iterate through file_ids for this tree.