Rev 1562: Replace directory separators. in file:///data/jelmer/bzr-svn/pushmerged/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1562
revision-id: jelmer at samba.org-20080804154727-m96k1axtcuzt805o
parent: jelmer at samba.org-20080803165708-2jyf59179jrjza2t
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pushmerged
timestamp: Mon 2008-08-04 17:47:27 +0200
message:
  Replace directory separators.
modified:
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
=== modified file 'branch.py'
--- a/branch.py	2008-08-03 16:42:54 +0000
+++ b/branch.py	2008-08-04 15:47:27 +0000
@@ -525,7 +525,7 @@
                             if self.repository.has_revision(x):
                                 continue
                             rev = other.repository.get_revision(x)
-                            nick = (rev.properties.get('branch-nick') or "merged").encode("utf-8")
+                            nick = (rev.properties.get('branch-nick') or "merged").encode("utf-8").replace("/","_")
                             rhs_branch_path = self.layout.get_branch_path(nick, self.project)
                             assert rhs_branch_path != self.get_branch_path()
                             push_new(self.repository,