← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to fetch_missing.py

  • Committer: Robert Collins
  • Date: 2005-09-28 05:50:54 UTC
  • mfrom: (201)
  • mto: (147.2.6) (364.1.3 bzrtools)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: robertc@robertcollins.net-20050928055054-dbbd7d7169db3a72
merge from abentley

Show diffs side-by-side

added added

removed removed

Lines of Context:
fetch_missing.py
20
20
    """Install the revisions of missing ancestors from another branch."""
21
21
    this_branch = Branch.open_containing('.')
22
22
    if branch is None:
23
 
        try:
24
 
            branch = this_branch.controlfile("x-pull", "rb").read().rstrip('\n')
25
 
            print "Using last location: %s" % branch
26
 
        except IOError, e:
27
 
            if e.errno != errno.ENOENT:
28
 
                raise
29
 
            else:
30
 
                raise BzrCommandError("No pull location known or specified.")
 
23
        branch = this_branch.get_parent()
31
24
 
32
25
    other_branch = Branch.open_containing(branch)
33
26
    installed = []