← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert Collins
  • Date: 2005-11-28 05:13:41 UTC
  • mfrom: (1185.33.54 merge-recovered)
  • Revision ID: robertc@robertcollins.net-20051128051341-059936f2f29a12c8
Merge from Martin. Adjust check to work with HTTP again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
115
115
                    if file_id is not None:
116
116
                        new_path = self.this_tree.relpath(new_name)
117
117
                        rename(new_name, name)
118
 
                        self.this_tree.branch.rename_one(relpath, new_path)
119
 
                        assert self.this_tree.id2path(file_id) == relpath
120
 
                        self.this_tree._inventory = self.this_tree.read_working_inventory()
 
118
                        self.this_tree.rename_one(relpath, new_path)
121
119
                        assert self.this_tree.id2path(file_id) == new_path
122
120
        except OSError, e:
123
121
            if e.errno != errno.EEXIST and e.errno != errno.ENOTEMPTY:
229
227
 
230
228
    def finalize(self):
231
229
        if not self.ignore_zero:
232
 
            note("%d conflicts encountered.\n", self.conflicts)
 
230
            note("%d conflicts encountered." % self.conflicts)
233
231
            
234
232
def get_tree(treespec, local_branch=None):
235
233
    location, revno = treespec
559
557
                if path == '.':
560
558
                    path = ''
561
559
                else:
562
 
                    assert path.startswith('.' + os.sep), "path is %s" % path
 
560
                    assert path.startswith('.' + '/') or path.startswith('.' + '\\'), "path is %s" % path
563
561
                path = path[2:]
564
562
            adjust_ids.append((path, id))
565
563
        if len(adjust_ids) > 0: