equal
deleted
inserted
replaced
82 if not repo[rev].node() in foreground: |
82 if not repo[rev].node() in foreground: |
83 if dirty: |
83 if dirty: |
84 msg = _("uncommitted changes") |
84 msg = _("uncommitted changes") |
85 hint = _("commit and merge, or update --clean to" |
85 hint = _("commit and merge, or update --clean to" |
86 " discard changes") |
86 " discard changes") |
87 raise error.Abort(msg, hint=hint) |
87 raise error.UpdateAbort(msg, hint=hint) |
88 elif not check: # destination is not a descendant. |
88 elif not check: # destination is not a descendant. |
89 msg = _("not a linear update") |
89 msg = _("not a linear update") |
90 hint = _("merge or update --check to force update") |
90 hint = _("merge or update --check to force update") |
91 raise error.Abort(msg, hint=hint) |
91 raise error.UpdateAbort(msg, hint=hint) |
92 |
92 |
93 return rev, movemark, activemark |
93 return rev, movemark, activemark |