← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin Pool
  • Date: 2005-05-17 06:56:16 UTC
  • Revision ID: mbp@sourcefrog.net-20050517065616-6f23381d6184a8aa
- add space for un-merged patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
58
58
        """Handle the case when the target file or dir exists"""
59
59
        self.add_suffix(target, ".moved")
60
60
            
61
 
class SourceFile(object):
 
61
class SourceFile:
62
62
    def __init__(self, path, id, present=None, isdir=None):
63
63
        self.path = path
64
64
        self.id = id