From 667a2b7b25e3b00af9f32753a9c06b7694194e32 Mon Sep 17 00:00:00 2001
From: Max Bowsher <maxb@f2s.com>
Date: Sat, 10 Oct 2009 00:36:45 +0100
Subject: Store tags on entire branch ancestry, not just left-hand ancestry.

---
 branch_updater.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'branch_updater.py')

diff --git a/branch_updater.py b/branch_updater.py
index b97f887..99e56c5 100644
--- a/branch_updater.py
+++ b/branch_updater.py
@@ -155,9 +155,10 @@ class BranchUpdater(object):
             changed = True
         # apply tags known in this branch
         my_tags = {}
+        ancestry = self.repo.get_ancestry(last_rev_id)
         if self.tags:
             for tag,rev in self.tags.items():
-                if rev in revs:
+                if rev in ancestry:
                     my_tags[tag] = rev
             if my_tags:
                 br.tags._set_tag_dict(my_tags)
-- 
cgit v1.2.1