← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/store.py

  • Committer: Martin Pool
  • Date: 2005-08-29 10:57:01 UTC
  • mfrom: (1092.1.41)
  • Revision ID: mbp@sourcefrog.net-20050829105701-7aaa81ecf1bfee05
- merge in merge improvements and additional tests 
  from aaron and lifeless

robertc@robertcollins.net-20050825131100-85772edabc817481

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/store.py
91
91
            
92
92
        p = self._path(fileid)
93
93
        if os.access(p, os.F_OK) or os.access(p + '.gz', os.F_OK):
94
 
            from bzrlib.errors import bailout
95
94
            raise BzrError("store %r already contains id %r" % (self._basedir, fileid))
96
95
 
97
96
        fn = p
143
142
        pb.clear()
144
143
        return count, []
145
144
 
146
 
 
147
145
    def copy_multi_immutable(self, other, to_copy, pb, permit_failure=False):
148
146
        from shutil import copyfile
149
147
        count = 0