equal
deleted
inserted
replaced
3880 parents = repo.parents() |
3880 parents = repo.parents() |
3881 else: |
3881 else: |
3882 parents = [repo[node]] |
3882 parents = [repo[node]] |
3883 if rej: |
3883 if rej: |
3884 ui.write_err(_("patch applied partially\n")) |
3884 ui.write_err(_("patch applied partially\n")) |
3885 ui.write_err(("(fix the .rej files and run " |
3885 ui.write_err(_("(fix the .rej files and run " |
3886 "`hg commit --amend`)\n")) |
3886 "`hg commit --amend`)\n")) |
3887 ret = 1 |
3887 ret = 1 |
3888 break |
3888 break |
3889 |
3889 |
3890 if not haspatch: |
3890 if not haspatch: |
3891 raise util.Abort(_('%s: no diffs found') % patchurl) |
3891 raise util.Abort(_('%s: no diffs found') % patchurl) |