Rev 1550: Support octopus merges. in file:///data/jelmer/bzr-svn/pushmerged/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/pushmerged/

------------------------------------------------------------
revno: 1550
revision-id: jelmer at samba.org-20080803053603-g4z6lccyt5751fe5
parent: jelmer at samba.org-20080803053531-8bnik0d6ea3kwshh
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pushmerged
timestamp: Sun 2008-08-03 07:36:03 +0200
message:
  Support octopus merges.
modified:
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
=== modified file 'branch.py'
--- a/branch.py	2008-08-03 04:54:31 +0000
+++ b/branch.py	2008-08-03 05:36:03 +0000
@@ -516,9 +516,9 @@
                           len(todo))
                 if push_merged:
                     parent_revids = graph.get_parent_map([revid])[revid]
-                    if len(parent_revids) > 1:
+                    for parent_revid in parent_revids[1:]:
                         # Push merged revisions
-                        unique_ancestors = graph.find_unique_ancestors(parent_revids[1], [parent_revids[0]])
+                        unique_ancestors = graph.find_unique_ancestors(parent_revid, [parent_revids[0]])
                         merged_revs = dict(zip(unique_ancestors, other.repository.get_revisions(unique_ancestors)))
                         for x in graph.iter_topo_order(unique_ancestors):
                             push_new(self.repository,