← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Robert Collins
  • Date: 2005-12-15 03:21:11 UTC
  • mfrom: (1185.56.2 fixes)
  • Revision ID: robertc@robertcollins.net-20051215032111-e68d5e6ffbd4b574
* Raise NoSuchFile when someone tries to add a non-existant file.
  (Michael Ellerman)

* Simplify handling of DivergedBranches in cmd_pull().
  (Michael Ellerman)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
399
399
            else:
400
400
                print "Using saved location: %s" % stored_loc
401
401
                location = stored_loc
 
402
 
402
403
        br_from = Branch.open(location)
403
404
        br_to = tree_to.branch
404
 
        try:
405
 
            old_rh = br_to.revision_history()
406
 
            count = tree_to.pull(br_from, overwrite)
407
 
        except DivergedBranches:
408
 
            # FIXME: Just make DivergedBranches display the right message
409
 
            # itself.
410
 
            raise BzrCommandError("These branches have diverged."
411
 
                                  "  Try merge.")
 
405
 
 
406
        old_rh = br_to.revision_history()
 
407
        count = tree_to.pull(br_from, overwrite)
 
408
 
412
409
        if br_to.get_parent() is None or remember:
413
410
            br_to.set_parent(location)
414
411
        note('%d revision(s) pulled.' % (count,))