branch | stable |
changeset 17255 | 3e856d8abe9c |
parent 17248 | 6ffb35b2284c |
child 17260 | e432fb4b4221 |
--- a/mercurial/commands.py Fri Jul 27 10:16:20 2012 +0200 +++ b/mercurial/commands.py Fri Jul 27 13:56:19 2012 +0200 @@ -3506,7 +3506,9 @@ parents = ctx.parents() changed = "" if default or id or num: - changed = util.any(repo.status()) and "+" or "" + if (util.any(repo.status()) + or util.any(ctx.sub(s).dirty() for s in ctx.substate)): + changed = '+' if default or id: output = ["%s%s" % ('+'.join([hexfunc(p.node()) for p in parents]), changed)]