Mercurial > hg
comparison mercurial/merge.py @ 19803:0f64af33fb63
merge: standardize error message for dirty subrepo
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Mon, 23 Sep 2013 20:53:14 -0700 |
| parents | 94c394653b2a |
| children | ab2362e1672e |
comparison
equal
deleted
inserted
replaced
| 19802:94c394653b2a | 19803:0f64af33fb63 |
|---|---|
| 713 if not force and (wc.files() or wc.deleted()): | 713 if not force and (wc.files() or wc.deleted()): |
| 714 raise util.Abort(_("uncommitted changes"), | 714 raise util.Abort(_("uncommitted changes"), |
| 715 hint=_("use 'hg status' to list changes")) | 715 hint=_("use 'hg status' to list changes")) |
| 716 for s in sorted(wc.substate): | 716 for s in sorted(wc.substate): |
| 717 if wc.sub(s).dirty(): | 717 if wc.sub(s).dirty(): |
| 718 raise util.Abort(_("outstanding uncommitted changes in " | 718 raise util.Abort(_("uncommitted changes in " |
| 719 "subrepository '%s'") % s) | 719 "subrepository '%s'") % s) |
| 720 | 720 |
| 721 elif not overwrite: | 721 elif not overwrite: |
| 722 if pa not in (p1, p2): # nolinear | 722 if pa not in (p1, p2): # nolinear |
| 723 dirty = wc.dirty(missing=True) | 723 dirty = wc.dirty(missing=True) |