Rev 2256: Push and pull operations now merge tags and report conflicts in their result in http://sourcefrog.net/bzr/tags

[Martin Pool]

At http://sourcefrog.net/bzr/tags

------------------------------------------------------------
revno: 2256
revision-id: mbp at sourcefrog.net-20070225105125-32o9nqxk062ncix0
parent: mbp at sourcefrog.net-20070225104729-st8znu3255avneia
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Sun 2007-02-25 21:51:25 +1100
message:
  Push and pull operations now merge tags and report conflicts in their result
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2007-02-25 10:47:29 +0000
+++ b/bzrlib/branch.py	2007-02-25 10:51:25 +0000
@@ -1451,6 +1451,7 @@
                     raise
             if overwrite:
                 self.set_revision_history(source.revision_history())
+            result.tag_conflicts = source.tags.merge_to(self.tags)
             result.new_revno, result.new_revid = self.last_revision_info()
             if _hook_master:
                 result.master = _hook_master
@@ -1497,6 +1498,7 @@
                     raise
             if overwrite:
                 target.set_revision_history(self.revision_history())
+            result.tag_conflicts = self.tags.merge_to(target.tags)
             result.new_revno, result.new_revid = target.last_revision_info()
             if _hook_master:
                 result.master = _hook_master