Mercurial > hg
comparison mercurial/merge.py @ 11470:34e33d50c26b stable
subrepo: correctly handle update -C with modified subrepos (issue2022)
(based on a patch by Saint Germain)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 30 Jun 2010 23:56:35 -0500 |
parents | ad27428c59ce |
children | eb07fbc21e9c db426935fa94 |
comparison
equal
deleted
inserted
replaced
11469:c37f35d7f2f5 | 11470:34e33d50c26b |
---|---|
165 repo.ui.debug(" ancestor %s local %s remote %s\n" % (pa, p1, p2)) | 165 repo.ui.debug(" ancestor %s local %s remote %s\n" % (pa, p1, p2)) |
166 | 166 |
167 m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest() | 167 m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest() |
168 copied = set(copy.values()) | 168 copied = set(copy.values()) |
169 | 169 |
170 if not overwrite and '.hgsubstate' in m1: | 170 if '.hgsubstate' in m1: |
171 # check whether sub state is modified | 171 # check whether sub state is modified |
172 for s in p1.substate: | 172 for s in p1.substate: |
173 if p1.sub(s).dirty(): | 173 if p1.sub(s).dirty(): |
174 m1['.hgsubstate'] += "+" | 174 m1['.hgsubstate'] += "+" |
175 break | 175 break |