--- a/hgext/chgserver.py	Sun Mar 20 10:44:15 2016 -0700
+++ b/hgext/chgserver.py	Sun Mar 20 15:11:34 2016 -0700
@@ -640,7 +640,10 @@
 
 class chgunixservice(commandserver.unixservice):
     def init(self):
-        self.repo = None
+        if self.repo:
+            # one chgserver can serve multiple repos. drop repo infomation
+            self.ui.setconfig('bundle', 'mainreporoot', '', 'repo')
+            self.repo = None
         self._inithashstate()
         self._checkextensions()
         class cls(AutoExitMixIn, SocketServer.ForkingMixIn,