~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/apply_bundle.py

• browse files at revision 4676.6.2
• compare with another revision
• download diff
• download tarball
• view history from revision 4676.6.2

• reverse the comparison (4676.6.2 to 5452)
• stop comparing with revision 5452

Show diffs side-by-side

added

removed

bzrlib/bundle/apply_bundle.py

1

 

# Copyright (C) 2005, 2006, 2007, 2009, 2010 Canonical Ltd

 

1

# Copyright (C) 2006 Canonical Ltd

2

2

#

3

3

# This program is free software; you can redistribute it and/or modify

4

4

# it under the terms of the GNU General Public License as published by

52

52

        pp = ProgressPhase("Merge phase", 6, pb)

53

53

        pp.next_phase()

54

54

        install_bundle(tree.branch.repository, reader)

55

 

        merger = Merger(tree.branch, this_tree=tree,

 

55

        merger = Merger(tree.branch, this_tree=tree, pb=pb,

56

56

                        change_reporter=change_reporter)

57

57

        merger.pp = pp

58

58

        merger.pp.next_phase()

59

 

        if check_clean and tree.has_changes():

60

 

            raise errors.UncommittedChanges(self)

 

59

        merger.check_basis(check_clean, require_commits=False)

61

60

        merger.other_rev_id = reader.target

62

61

        merger.other_tree = merger.revision_tree(reader.target)

63

62

        merger.other_basis = reader.target

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1