← 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-09-13 23:18:12 UTC
  • Revision ID: mbp@sourcefrog.net-20050913231812-dc1df8fb11f78a31
- rename last_patch to last_revision

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
137
137
    if revno is None:
138
138
        revision = None
139
139
    elif revno == -1:
140
 
        revision = branch.last_patch()
 
140
        revision = branch.last_revision()
141
141
    else:
142
142
        revision = branch.lookup_revision(revno)
143
143
    return branch, get_revid_tree(branch, revision, temp_root, label,
244
244
        if this_dir is None:
245
245
            this_dir = '.'
246
246
        this_branch = find_branch(this_dir)
247
 
        this_rev_id = this_branch.last_patch()
 
247
        this_rev_id = this_branch.last_revision()
248
248
        if this_rev_id is None:
249
249
            raise BzrCommandError("This branch has no commits")
250
250
        if check_clean:
255
255
        other_branch, other_tree = get_tree(other_revision, tempdir, "other",
256
256
                                            this_branch)
257
257
        if other_revision[1] == -1:
258
 
            other_rev_id = other_branch.last_patch()
 
258
            other_rev_id = other_branch.last_revision()
259
259
            other_basis = other_rev_id
260
260
        elif other_revision[1] is not None:
261
261
            other_rev_id = other_branch.lookup_revision(other_revision[1])
262
262
            other_basis = other_rev_id
263
263
        else:
264
264
            other_rev_id = None
265
 
            other_basis = other_branch.last_patch()
 
265
            other_basis = other_branch.last_revision()
266
266
        if base_revision == [None, None]:
267
267
            base_rev_id = common_ancestor(this_rev_id, other_basis, 
268
268
                                          this_branch)
274
274
        else:
275
275
            base_branch, base_tree = get_tree(base_revision, tempdir, "base")
276
276
            if base_revision[1] == -1:
277
 
                base_rev_id = base_branch.last_patch()
 
277
                base_rev_id = base_branch.last_revision()
278
278
            elif base_revision[1] is None:
279
279
                base_rev_id = None
280
280
            else: