equal
deleted
inserted
replaced
1560 if repo[node].node() in foreground: |
1560 if repo[node].node() in foreground: |
1561 pass # allow updating to successors |
1561 pass # allow updating to successors |
1562 else: |
1562 else: |
1563 msg = _("uncommitted changes") |
1563 msg = _("uncommitted changes") |
1564 hint = _("commit or update --clean to discard changes") |
1564 hint = _("commit or update --clean to discard changes") |
1565 raise error.Abort(msg, hint=hint) |
1565 raise error.UpdateAbort(msg, hint=hint) |
1566 else: |
1566 else: |
1567 # Allow jumping branches if clean and specific rev given |
1567 # Allow jumping branches if clean and specific rev given |
1568 pass |
1568 pass |
1569 |
1569 |
1570 if overwrite: |
1570 if overwrite: |