Rev 1548: Fix property name of branch nick. in file:///data/jelmer/bzr-svn/pushmerged/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1548
revision-id: jelmer at samba.org-20080803045431-772f2aatnzawcblt
parent: jelmer at samba.org-20080803045420-629aphb47gxubij2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pushmerged
timestamp: Sun 2008-08-03 06:54:31 +0200
message:
  Fix property name of branch nick.
modified:
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
=== modified file 'branch.py'
--- a/branch.py	2008-08-03 04:38:52 +0000
+++ b/branch.py	2008-08-03 04:54:31 +0000
@@ -522,7 +522,7 @@
                         merged_revs = dict(zip(unique_ancestors, other.repository.get_revisions(unique_ancestors)))
                         for x in graph.iter_topo_order(unique_ancestors):
                             push_new(self.repository, 
-                                    self.layout.get_branch_path(merged_revs[x].properties.get('nick') or "merged", self.project),
+                                    self.layout.get_branch_path(merged_revs[x].properties.get('branch-nick') or "merged", self.project),
                                      other, x)
                             self._clear_cached_state()
                 push(self, other, revid)