##// END OF EJS Templates
subrepo: fix hgrc paths section during subrepo pulling...
Edouard Gomez -
r10697:c90d923f stable
parent child Browse files
Show More
@@ -193,8 +193,11 b' class hgsubrepo(object):'
193 fp.write('%s = %s\n' % (key, value))
193 fp.write('%s = %s\n' % (key, value))
194 self._repo.ui.setconfig('paths', key, value)
194 self._repo.ui.setconfig('paths', key, value)
195
195
196 defpath = os.path.join(_abssource(ctx._repo), path)
196 defpath = _abssource(self._repo)
197 defpushpath = _abssource(self._repo, True)
197 addpathconfig('default', defpath)
198 addpathconfig('default', defpath)
199 if defpath != defpushpath:
200 addpathconfig('default-push', defpushpath)
198 fp.close()
201 fp.close()
199
202
200 def dirty(self):
203 def dirty(self):
@@ -263,6 +263,6 b' committing subrepository nested_absolute'
263 updating to branch default
263 updating to branch default
264 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
264 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
265 [paths]
265 [paths]
266 default = $HGTMP/test-subrepo/sub/mercurial/main/nested_absolute
266 default = $HGTMP/test-subrepo/sub/mercurial/nested_absolute
267 [paths]
267 [paths]
268 default = $HGTMP/test-subrepo/sub/mercurial/main/nested_relative
268 default = $HGTMP/test-subrepo/sub/mercurial/main/../nested_relative
General Comments 0
You need to be logged in to leave comments. Login now