comparison mercurial/subrepo.py @ 10069:606b563e41db

Merge with -stable
author Matt Mackall <mpm@selenic.com>
date Mon, 14 Dec 2009 15:02:02 -0600
parents 30d51a0df46c 8f14f749f471
children 65b6dc44cdbf
comparison
equal deleted inserted replaced
10067:fd6729805f44 10069:606b563e41db
173 if os.path.exists(os.path.join(root, '.hg')): 173 if os.path.exists(os.path.join(root, '.hg')):
174 self._repo = hg.repository(r.ui, root) 174 self._repo = hg.repository(r.ui, root)
175 else: 175 else:
176 util.makedirs(root) 176 util.makedirs(root)
177 self._repo = hg.repository(r.ui, root, create=True) 177 self._repo = hg.repository(r.ui, root, create=True)
178 f = file(os.path.join(root, '.hg', 'hgrc'), 'w')
179 f.write('[paths]\ndefault = %s\n' % state[0])
180 f.close()
178 self._repo._subparent = r 181 self._repo._subparent = r
179 self._repo._subsource = state[0] 182 self._repo._subsource = state[0]
180 183
181 def dirty(self): 184 def dirty(self):
182 r = self._state[1] 185 r = self._state[1]