← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store/text.py

Merge from Robert

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store/text.py
95
95
            raise KeyError(fileid + '-' + str(suffix))
96
96
 
97
97
        try:
98
 
            result = other._transport.copy_to([path], self._transport, pb=pb,
 
98
            result = other._transport.copy_to([path], self._transport, 
99
99
                                              mode=self._file_mode)
100
100
        except NoSuchFile:
101
101
            if not self._prefixed:
104
104
                self._transport.mkdir(hash_prefix(fileid)[:-1], mode=self._dir_mode)
105
105
            except FileExists:
106
106
                pass
107
 
            result = other._transport.copy_to([path], self._transport, pb=pb,
 
107
            result = other._transport.copy_to([path], self._transport,
108
108
                                              mode=self._file_mode)
109
109
 
110
110
        if result != 1: