← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tag.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-11 04:02:41 UTC
  • mfrom: (5017.2.2 tariff)
  • Revision ID: pqm@pqm.ubuntu.com-20100211040241-w6n021dz0uus341n
(mbp) add import-tariff tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tag.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007 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
26
26
# called tags* are ctags files... mbp 20070220.
27
27
 
28
28
 
 
29
from warnings import warn
 
30
 
29
31
from bzrlib import (
30
32
    bencode,
31
33
    errors,
251
253
 
252
254
def _merge_tags_if_possible(from_branch, to_branch):
253
255
    from_branch.tags.merge_to(to_branch.tags)
254