← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Jason Spashett
  • Date: 2010-06-18 11:07:07 UTC
  • mto: This revision was merged to the branch mainline in revision 5315.
  • Revision ID: jason@spashett.com-20100618110707-me59kfy33lux7doc
Take away removal of --profile-imports from bzr script. Instead ignore this in global options bzrlib/commands.py run_bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
494
494
    #  - lock the names list
495
495
    #  - perform a customised pack() that regenerates data as needed
496
496
    #  - unlock the names list
497
 
    # https://bugs.edge.launchpad.net/bzr/+bug/154173
 
497
    # https://bugs.launchpad.net/bzr/+bug/154173
498
498
 
499
499
    def _reconcile_steps(self):
500
500
        """Perform the steps to reconcile this repository."""