Mercurial > public > mercurial-scm > hg
comparison mercurial/subrepo.py @ 15735:5b384b7f48d5
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 26 Dec 2011 18:08:20 -0600 |
parents | 309e49491253 1581da01d5c4 |
children | 4bc715f2a356 |
comparison
equal
deleted
inserted
replaced
15734:9b0efacd7745 | 15735:5b384b7f48d5 |
---|---|
90 src = remap(src) | 90 src = remap(src) |
91 else: | 91 else: |
92 src = remapped | 92 src = remapped |
93 | 93 |
94 src = remap(src) | 94 src = remap(src) |
95 state[path] = (src.strip(), rev.get(path, ''), kind) | 95 state[util.pconvert(path)] = (src.strip(), rev.get(path, ''), kind) |
96 | 96 |
97 return state | 97 return state |
98 | 98 |
99 def writestate(repo, state): | 99 def writestate(repo, state): |
100 """rewrite .hgsubstate in (outer) repo with these subrepo states""" | 100 """rewrite .hgsubstate in (outer) repo with these subrepo states""" |