Rev 6501: Use a proper unique url for remote config files. in file:///home/vila/src/bzr/bugs/832042-shared-stores/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/832042-shared-stores/

------------------------------------------------------------
revno: 6501
revision-id: v.ladeuil+lp at free.fr-20120731091807-tft1lk8zw84rp1nj
parent: v.ladeuil+lp at free.fr-20120731091734-700oburs0806cont
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 832042-shared-stores
timestamp: Tue 2012-07-31 11:18:07 +0200
message:
  Use a proper unique url for remote config files.
-------------- next part --------------
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py	2012-02-23 19:45:15 +0000
+++ b/bzrlib/remote.py	2012-07-31 09:18:07 +0000
@@ -384,7 +384,7 @@
             self._real_store = _mod_config.ControlStore(self.bzrdir)
 
     def external_url(self):
-        return self.bzrdir.user_url
+        return urlutils.join(self.branch.user_url, 'control.conf')
 
     def _load_content(self):
         medium = self.bzrdir._client._medium
@@ -3263,7 +3263,7 @@
         self._real_store = None
 
     def external_url(self):
-        return self.branch.user_url
+        return urlutils.join(self.branch.user_url, 'branch.conf')
 
     def _load_content(self):
         path = self.branch._remote_path()