← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

Merge bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
380
380
        self.pb_stage_count = 0
381
381
        self.pb_stage_total = 5
382
382
        if self.bound_branch:
383
 
            self.pb_stage_total += 1
 
383
            # 2 extra stages: "Uploading data to master branch" and "Merging
 
384
            # tags to master branch"
 
385
            self.pb_stage_total += 2
384
386
        self.pb.show_pct = False
385
387
        self.pb.show_spinner = False
386
388
        self.pb.show_eta = False
450
452
        # and now do the commit locally.
451
453
        self.branch.set_last_revision_info(new_revno, self.rev_id)
452
454
 
 
455
        # Merge local tags to remote
 
456
        if self.bound_branch:
 
457
            self._set_progress_stage("Merging tags to master branch")
 
458
            tag_conflicts = self.branch.tags.merge_to(self.master_branch.tags)
 
459
            if tag_conflicts:
 
460
                warning_lines = ['    ' + name for name, _, _ in tag_conflicts]
 
461
                note("Conflicting tags in bound branch:\n" +
 
462
                    "\n".join(warning_lines))
 
463
 
453
464
        # Make the working tree be up to date with the branch. This
454
465
        # includes automatic changes scheduled to be made to the tree, such
455
466
        # as updating its basis and unversioning paths that were missing.