← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

More cleanup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
441
441
        return s
442
442
 
443
443
    def cleanup(self, tree):
 
444
        # No additional files have been generated here
444
445
        pass
445
446
 
446
447
    def keep_mine(self, tree):
460
461
 
461
462
    format = 'Contents conflict in %(path)s'
462
463
 
463
 
    # FIXME: done() should fail ? -- vila 091224
464
 
 
465
464
    def cleanup(self, tree):
466
465
        for suffix in ('.BASE', '.OTHER'):
467
466
            try:
683
682
             "  %(action)s."
684
683
 
685
684
    def keep_mine(self, tree):
686
 
        # FIXME: we should preserve that path at conflict build time !
 
685
        # FIXME: we should preserve that path when the conflict is generated !
687
686
        if self.path.endswith('.new'):
688
687
            conflict_path = self.path[:-(len('.new'))]
689
688
            tree.remove([self.path], force=True, keep_files=False)
692
691
            raise NotImplementedError(self.keep_mine)
693
692
 
694
693
    def take_their(self, tree):
695
 
        # FIXME: we should preserve that path at conflict build time !
 
694
        # FIXME: we should preserve that path when the conflict is generated !
696
695
        if self.path.endswith('.new'):
697
696
            conflict_path = self.path[:-(len('.new'))]
698
697
            tree.remove([conflict_path], force=True, keep_files=False)