Show More
@@ -801,10 +801,8 b' def manifestmerge(repo, wctx, p2, pa, br' | |||
|
801 | 801 | |
|
802 | 802 | if '.hgsubstate' in m1: |
|
803 | 803 | # check whether sub state is modified |
|
804 |
for s in |
|
|
805 | if wctx.sub(s).dirty(): | |
|
806 | m1['.hgsubstate'] += '+' | |
|
807 | break | |
|
804 | if any(wctx.sub(s).dirty() for s in wctx.substate): | |
|
805 | m1['.hgsubstate'] += '+' | |
|
808 | 806 | |
|
809 | 807 | # Compare manifests |
|
810 | 808 | if matcher is not None: |
General Comments 0
You need to be logged in to leave comments.
Login now