Rev 1555: Encode branch nick. in file:///data/jelmer/bzr-svn/pushmerged/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1555
revision-id: jelmer at samba.org-20080803151220-76vjsflj3utgjdg6
parent: jelmer at samba.org-20080803151202-k2p9frleszlhz94a
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pushmerged
timestamp: Sun 2008-08-03 17:12:20 +0200
message:
  Encode branch nick.
modified:
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
=== modified file 'branch.py'
--- a/branch.py	2008-08-03 05:53:44 +0000
+++ b/branch.py	2008-08-03 15:12:20 +0000
@@ -521,7 +521,8 @@
                         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)
+                            nick = (rev.properties.get('branch-nick') or "merged").encode("utf-8")
+                            rhs_branch_path = self.layout.get_branch_path(nick, self.project)
                             assert rhs_branch_path != self.get_branch_path()
                             push_new(self.repository, 
                                     rhs_branch_path,