At http://people.ubuntu.com/~robertc/baz2.0/integration
------------------------------------------------------------ revno: 4037 revision-id: [email protected] parent: [email protected] committer: Robert Collins <[email protected]> branch nick: integration timestamp: Tue 2009-02-24 19:47:58 +1100 message: Move BzrBranch._push_should_merge_tags to Branch. === modified file 'bzrlib/branch.py' --- a/bzrlib/branch.py 2009-02-24 08:09:17 +0000 +++ b/bzrlib/branch.py 2009-02-24 08:47:58 +0000 @@ -148,6 +148,14 @@ possible_transports) return control.open_branch(), relpath + def _push_should_merge_tags(self): + """Should _basic_push merge this branch's tags into the target? + + The default implementation returns False if this branch has no tags, + and True the rest of the time. Subclasses may override this. + """ + return self.tags.supports_tags() and self.tags.get_tag_dict() + def get_config(self): return BranchConfig(self) @@ -2073,14 +2081,6 @@ result.new_revno, result.new_revid = target.last_revision_info() return result - def _push_should_merge_tags(self): - """Should _basic_push merge this branch's tags into the target? - - The default implementation returns False if this branch has no tags, - and True the rest of the time. Subclasses may override this. - """ - return self.tags.supports_tags() and self.tags.get_tag_dict() - def get_parent(self): """See Branch.get_parent.""" parent = self._get_parent_location() -- bazaar-commits mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
