changeset 24471 | 1ff35d76421c |
parent 24364 | 135b23868f45 |
child 24709 | 69154e0ae384 |
--- a/hgext/strip.py Wed Mar 25 13:55:32 2015 +0900 +++ b/hgext/strip.py Wed Mar 25 13:55:35 2015 +0900 @@ -23,10 +23,8 @@ else: bctx = wctx.parents()[0] for s in sorted(wctx.substate): - if wctx.sub(s).dirty(True): - raise util.Abort( - _("uncommitted changes in subrepository %s") % s) - elif s not in bctx.substate or bctx.sub(s).dirty(): + wctx.sub(s).bailifchanged(True) + if s not in bctx.substate or bctx.sub(s).dirty(): inclsubs.append(s) return inclsubs