← 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-10-09 22:43:56 UTC
  • mfrom: (1185.12.18)
  • Revision ID: robertc@robertcollins.net-20051009224356-9e0f3edb29f2498f
merge from Aaron - unbreaks open_containing and the fetch progress bar

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
29
29
from bzrlib.errors import BzrCommandError, UnrelatedBranches, NoCommonAncestor
30
30
from bzrlib.errors import NoCommits
31
31
from bzrlib.delta import compare_trees
32
 
from bzrlib.trace import mutter, warning
 
32
from bzrlib.trace import mutter, warning, note
33
33
from bzrlib.fetch import greedy_fetch, fetch
34
34
from bzrlib.revision import is_ancestor
35
35
from bzrlib.osutils import rename
39
39
# TODO: build_working_dir can be built on something simpler than merge()
40
40
 
41
41
# FIXME: merge() parameters seem oriented towards the command line
 
42
# NOTABUG: merge is a helper for commandline functions.  merge_inner is the
 
43
#          the core functionality.
42
44
 
43
45
# comments from abentley on irc: merge happens in two stages, each
44
46
# of which generates a changeset object
190
192
 
191
193
    def finalize(self):
192
194
        if not self.ignore_zero:
193
 
            print "%d conflicts encountered.\n" % self.conflicts
 
195
            note("%d conflicts encountered.\n" % self.conflicts)
194
196
            
195
197
def get_tree(treespec, temp_root, label, local_branch=None):
196
198
    location, revno = treespec