Mercurial > hg

comparison mercurial/subrepo.py @ 9780:1ee085511b89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: notice dirty subrepo states when merging
author Matt Mackall <mpm@selenic.com>
date Sat, 07 Nov 2009 16:30:42 -0600
parents 58a6f3f4d553
children eccc8aacd6f9
comparison
equal deleted inserted replaced
9779:58a6f3f4d553 9780:1ee085511b89
56 if r: 56 if r:
57 r = "%s:%s" % r 57 r = "%s:%s" % r
58 repo.ui.debug(_(" subrepo %s: %s %s\n") % (s, msg, r)) 58 repo.ui.debug(_(" subrepo %s: %s %s\n") % (s, msg, r))
59 59
60 for s, l in s1.items(): 60 for s, l in s1.items():
61 if wctx.sub(s).dirty():
62 l = (l[0], l[1] + "+")
61 a = sa.get(s, nullstate) 63 a = sa.get(s, nullstate)
62 if s in s2: 64 if s in s2:
63 r = s2[s] 65 r = s2[s]
64 if l == r or r == a: # no change or local is newer 66 if l == r or r == a: # no change or local is newer
65 sm[s] = l 67 sm[s] = l