/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: John Arbash Meinel
  • Date: 2010-08-06 19:54:45 UTC
  • mfrom: (5050.3.21 2.2-final)
  • mto: This revision was merged to the branch mainline in revision 5371.
  • Revision ID: john@arbash-meinel.com-20100806195445-7vsjls3uf8o6t7kt
Merge the 2.2-final branch into trunk, in preparation for release.

Had to fix up one NEWS entry that accidentally got merged into the 2.2 section.

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."""