Rev 1560: Avoid pushing revisions more than once. in file:///data/jelmer/bzr-svn/pushmerged/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1560
revision-id: jelmer at samba.org-20080803164254-8hx3afbt3p6nhs9l
parent: jelmer at samba.org-20080803164220-27pf97x2fe9duajb
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pushmerged
timestamp: Sun 2008-08-03 18:42:54 +0200
message:
  Avoid pushing revisions more than once.
modified:
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
=== modified file 'branch.py'
--- a/branch.py	2008-08-03 15:12:20 +0000
+++ b/branch.py	2008-08-03 16:42:54 +0000
@@ -517,9 +517,13 @@
                 if push_merged:
                     parent_revids = graph.get_parent_map([revid])[revid]
                     for parent_revid in parent_revids[1:]:
+                        if self.repository.has_revision(parent_revid):
+                            continue
                         # Push merged revisions
                         unique_ancestors = graph.find_unique_ancestors(parent_revid, [parent_revids[0]])
                         for x in graph.iter_topo_order(unique_ancestors):
+                            if self.repository.has_revision(x):
+                                continue
                             rev = other.repository.get_revision(x)
                             nick = (rev.properties.get('branch-nick') or "merged").encode("utf-8")
                             rhs_branch_path = self.layout.get_branch_path(nick, self.project)