← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Robert Collins
  • Date: 2005-08-25 10:04:51 UTC
  • mto: (974.1.50) (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: robertc@robertcollins.net-20050825100451-b01297285491ba46
make a default merge choose a sane base with branch.common_ancestor

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
18
import bzrlib.errors
 
19
import bzrlib.progress
19
20
 
20
21
 
21
22
def upgrade(branch):
34
35
 
35
36
    from bzrlib.trace import mutter
36
37
    from bzrlib.errors import BzrCheckError
37
 
    from bzrlib.progress import ProgressBar
 
38
    import bzrlib.ui
38
39
 
39
40
    branch.lock_write()
40
41
 
 
42
    pb = bzrlib.ui.progress_bar()
 
43
 
41
44
    try:
42
 
        pb = ProgressBar(show_spinner=True)
43
45
        last_rev_id = None
44
46
 
45
47
        history = branch.revision_history()