Merge lp:~james-w/pqm/tags into lp:pqm

[James Westby]

[James Westby (james-w)]

PQM didn't try and merge the tags from a bzr branch when doing star merge,
making it hard to provide tags in the trunk of a project.

Thanks,

James

[Robert Collins (lifeless)]

However, next time you put a branch up for merge, please run the test
suite first. You would have seen your code was broken :)

Tests would be better, but I want to clear the decks so am just doing
it.

-Rob

=== modified file 'pqm/__init__.py'
--- pqm/__init__.py	2008-08-05 06:31:49 +0000
+++ pqm/__init__.py	2009-03-05 06:50:07 +0000
@@ -418,6 +418,7 @@
 
     def _do_star_merge(self, sender, from_branch, local_dir, tree):
         from bzrlib.merge import Merger, Merge3Merger
+        from bzrlib.tag import _merge_tags_if_possible
         merger = Merger(tree.branch, this_tree=tree)
         merger.check_basis(True)
         merger.set_other([from_branch, -1])
@@ -440,6 +441,7 @@
             finally:
                 tree.unlock()
             raise PQMTlaFailure(sender, error_lines)
+        _merge_tags_if_possible(from_branch, tree.branch)
         return ["merge successful"]
         
     def make_local_dir(self, sender, branch_spec, output_dir):