← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Alexander Belchenko
  • Date: 2007-02-02 09:14:30 UTC
  • mfrom: (2256 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2259.
  • Revision ID: bialix@ukr.net-20070202091430-vdgouvazded1yfqw
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
141
141
 
142
142
    def check_basis(self, check_clean, require_commits=True):
143
143
        if self.this_basis is None and require_commits is True:
144
 
            raise BzrCommandError("This branch has no commits")
 
144
            raise BzrCommandError("This branch has no commits."
 
145
                                  " (perhaps you would prefer 'bzr pull')")
145
146
        if check_clean:
146
147
            self.compare_basis()
147
148
            if self.this_basis != self.this_rev_id:
572
573
            parent_id = self.tt.final_parent(trans_id)
573
574
            if file_id in self.this_tree.inventory:
574
575
                self.tt.unversion_file(trans_id)
575
 
                self.tt.delete_contents(trans_id)
 
576
                if file_id in self.this_tree:
 
577
                    self.tt.delete_contents(trans_id)
576
578
            file_group = self._dump_conflicts(name, parent_id, file_id, 
577
579
                                              set_version=True)
578
580
            self._raw_conflicts.append(('contents conflict', file_group))