← 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-10-11 03:41:44 UTC
  • Revision ID: robertc@robertcollins.net-20051011034144-19aca2bd13f66055
only do a local merge during pull if the revision history changed

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
348
348
            br_from.setup_caching(cache_root)
349
349
            location = br_from.base
350
350
            old_revno = br_to.revno()
 
351
            old_revision_history = br_to.revision_history()
351
352
            try:
352
353
                br_to.update_revisions(br_from)
353
354
            except DivergedBranches:
354
355
                raise BzrCommandError("These branches have diverged."
355
356
                    "  Try merge.")
356
 
                
357
 
            merge(('.', -1), ('.', old_revno), check_clean=False)
 
357
            new_revision_history = br_to.revision_history()
 
358
            if new_revision_history != old_revision_history:
 
359
                merge(('.', -1), ('.', old_revno), check_clean=False)
358
360
            if stored_loc is None or remember:
359
361
                br_to.set_parent(location)
360
362
        finally: