diff options
| author | Max Bowsher <maxb@f2s.com> | 2009-10-10 00:36:45 +0100 |
|---|---|---|
| committer | Max Bowsher <maxb@f2s.com> | 2009-10-10 00:36:45 +0100 |
| commit | 667a2b7b25e3b00af9f32753a9c06b7694194e32 (patch) | |
| tree | 8c3f013e52a2e817c2fddd1f8a05527610ece641 /branch_updater.py | |
| parent | 3e02777de0216d80d19f56e5b0436673675781f5 (diff) | |
| download | bzr-fastimport-667a2b7b25e3b00af9f32753a9c06b7694194e32.tar.gz | |
Store tags on entire branch ancestry, not just left-hand ancestry.
Diffstat (limited to 'branch_updater.py')
| -rw-r--r-- | branch_updater.py | 3 |
1 files changed, 2 insertions, 1 deletions
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) |