Rev 1553: Make sure mainline is never interrupted. in file:///data/jelmer/bzr-svn/pushmerged/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1553
revision-id: jelmer at samba.org-20080803055344-7k7n1t6sdudph13f
parent: jelmer at samba.org-20080803054823-qumf91ve5o10zfpf
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pushmerged
timestamp: Sun 2008-08-03 07:53:44 +0200
message:
  Make sure mainline is never interrupted.
modified:
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
=== modified file 'branch.py'
--- a/branch.py	2008-08-03 05:48:23 +0000
+++ b/branch.py	2008-08-03 05:53:44 +0000
@@ -521,8 +521,10 @@
                         unique_ancestors = graph.find_unique_ancestors(parent_revid, [parent_revids[0]])
                         for x in graph.iter_topo_order(unique_ancestors):
                             rev = other.repository.get_revision(x)
+                            rhs_branch_path = self.layout.get_branch_path(rev.properties.get('branch-nick') or "merged", self.project)
+                            assert rhs_branch_path != self.get_branch_path()
                             push_new(self.repository, 
-                                    self.layout.get_branch_path(rev.properties.get('branch-nick') or "merged", self.project),
+                                    rhs_branch_path,
                                     other, x)
                             self._clear_cached_state()
                 push(self, other, revid)