diff options
author | Richard Wilbur <richard.wilbur@gmail.com> | 2014-01-19 20:15:38 -0700 |
---|---|---|
committer | Richard Wilbur <richard.wilbur@gmail.com> | 2014-01-19 20:15:38 -0700 |
commit | 0fef0ad22cb027f0a6c8de4e79008f493e681b4d (patch) | |
tree | aab75377a9c38eab655ebf39e5a629b34d0968d6 | |
parent | b3cda9967f857127bd4dab5eb72223a95916f5ea (diff) | |
parent | d7835a4581241e02d6c3960185bc867337d68a2b (diff) | |
download | bzr-fastimport-0fef0ad22cb027f0a6c8de4e79008f493e681b4d.tar.gz |
Merge restored get_ancestry() method from Zygmunt Krynicki to fix interactions with git.
-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 fcb13d5..e9a8aa5 100644 --- a/branch_updater.py +++ b/branch_updater.py @@ -165,7 +165,8 @@ class BranchUpdater(object): # apply tags known in this branch my_tags = {} if self.tags: - ancestry = self.repo.get_ancestry(last_rev_id) + graph = self.repo.get_graph() + ancestry = [r for (r, ps) in graph.iter_ancestry([last_rev_id]) if ps is not None] for tag,rev in self.tags.items(): if rev in ancestry: my_tags[tag] = rev |