Rev 1552: Deal with ghosts. in file:///data/jelmer/bzr-svn/pushmerged/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1552
revision-id: jelmer at samba.org-20080803054823-qumf91ve5o10zfpf
parent: jelmer at samba.org-20080803053609-2tu1pbbnp17b5tq3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pushmerged
timestamp: Sun 2008-08-03 07:48:23 +0200
message:
  Deal with ghosts.
modified:
  BRANCH.TODO                    branch.todo-20070721175243-w23kkak0gm2jbr8b-1
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
=== modified file 'BRANCH.TODO'
--- a/BRANCH.TODO	2008-08-03 05:36:09 +0000
+++ b/BRANCH.TODO	2008-08-03 05:48:23 +0000
@@ -1,6 +1,5 @@
 pushmerge:
  - make pushmerge option in repository configuration
- - deal with ghosts in rhs parents
  - create branches/ dir automatically
  - invoke from InterSvnBzrRepository as well
 

=== modified file 'branch.py'
--- a/branch.py	2008-08-03 05:36:03 +0000
+++ b/branch.py	2008-08-03 05:48:23 +0000
@@ -519,11 +519,11 @@
                     for parent_revid in parent_revids[1:]:
                         # Push merged revisions
                         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):
+                            rev = other.repository.get_revision(x)
                             push_new(self.repository, 
-                                    self.layout.get_branch_path(merged_revs[x].properties.get('branch-nick') or "merged", self.project),
-                                     other, x)
+                                    self.layout.get_branch_path(rev.properties.get('branch-nick') or "merged", self.project),
+                                    other, x)
                             self._clear_cached_state()
                 push(self, other, revid)
                 self._clear_cached_state()