← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Matthieu Moy
  • Date: 2006-09-11 07:58:50 UTC
  • mto: (1998.1.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1999.
  • Revision ID: Matthieu.Moy@imag.fr-20060911075850-dac85ac1c8d9f022
Canceled an incorrect "path = None".

Indeed, the "path" problem is managed in the revisionspec for revno:N:branch/path.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2165
2165
            branch = revision[0].get_branch() or branch
2166
2166
            if len(revision) == 1:
2167
2167
                base = [None, None]
2168
 
                other_branch = Branch.open_containing(branch)
2169
 
                path = None
 
2168
                other_branch, path = Branch.open_containing(branch)
2170
2169
                revno = revision[0].in_history(other_branch).revno
2171
2170
                other = [branch, revno]
2172
2171
            else:
2183
2182
                    raise BzrCommandError(
2184
2183
                        "Merge doesn't accept two revisions "
2185
2184
                        "in different branches.")
2186
 
                other_branch = Branch.open_containing(branch)
2187
 
                path = None
 
2185
                other_branch, path = Branch.open_containing(branch)
2188
2186
 
2189
2187
                base = [branch, revision[0].in_history(other_branch).revno]
2190
2188
                other = [branch, revision[1].in_history(other_branch).revno]