~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/merge.py

Committer: Martin Pool
Date: 2005-11-23 06:29:27 UTC
mto: (1185.74.1 bzr.dev (Main development branch)) (1505.1.19 bzr-bound-branch) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1534.1.1 integration) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
mto: This revision was merged to the branch mainline in revision 1512.
Revision ID: mbp@sourcefrog.net-20051123062927-f33c0abd742146af

[patch] show number of revisions pushed/pulled/merged (Robey Pointer)

added added

removed removed

229

230

def finalize(self):

231

if not self.ignore_zero:

232

note("%d conflicts encountered.\n", self.conflicts)

232

note("%d conflicts encountered." % self.conflicts)

233

234

def get_tree(treespec, local_branch=None):

235

location, revno = treespec