/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Robert Collins
  • Date: 2010-06-25 06:11:21 UTC
  • mto: This revision was merged to the branch mainline in revision 5324.
  • Revision ID: robertc@robertcollins.net-20100625061121-0cx949gxhae5aeib
The symbol_versioning module can now cleanup after itself -
``suppress_deprecation_warnings`` now returns a cleanup function.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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."""