~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/merge.py

Committer: Robert Collins
Date: 2005-09-23 03:22:16 UTC
mfrom: (1185.8.5)
mto: (1092.3.4) (1185.41.1 bzr.sftp) (1417.1.4) (1464.1.1) (1534.1.1 integration) (1495.1.4) (1505.1.16 bzr-bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores) (1393.1.21)
mto: This revision was merged to the branch mainline in revision 1390.
Revision ID: robertc@robertcollins.net-20050923032216-07993f0fc9844e91

bugfix from Aaron Bentley - bzrlib.graph.max_distance had an off-by-1 error

added added

removed removed

134

135

def get_tree(treespec, temp_root, label, local_branch=None):

136

location, revno = treespec

137

branch = Branch.open(location)

137

branch = Branch.open_containing(location)

138

if revno is None:

139

revision = None

140

elif revno == -1: