← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Martin Pool
  • Date: 2005-08-29 10:57:01 UTC
  • mfrom: (1092.1.41)
  • Revision ID: mbp@sourcefrog.net-20050829105701-7aaa81ecf1bfee05
- merge in merge improvements and additional tests 
  from aaron and lifeless

robertc@robertcollins.net-20050825131100-85772edabc817481

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
39
39
 
40
40
    branch.lock_write()
41
41
 
42
 
    pb = bzrlib.ui.progress_bar()
 
42
    pb = bzrlib.ui.ui_factory.progress_bar()
43
43
 
44
44
    try:
45
45
        last_rev_id = None