equal
deleted
inserted
replaced
2430 back locally is ineffective (someone else may already have pulled |
2430 back locally is ineffective (someone else may already have pulled |
2431 the changes). Furthermore, a race is possible with readers of the |
2431 the changes). Furthermore, a race is possible with readers of the |
2432 repository; for example an in-progress pull from the repository |
2432 repository; for example an in-progress pull from the repository |
2433 may fail if a rollback is performed. |
2433 may fail if a rollback is performed. |
2434 """ |
2434 """ |
2435 repo.undo() |
2435 repo.rollback() |
2436 |
2436 |
2437 def root(ui, repo): |
2437 def root(ui, repo): |
2438 """print the root (top) of the current working dir |
2438 """print the root (top) of the current working dir |
2439 |
2439 |
2440 Print the root directory of the current repository. |
2440 Print the root directory of the current repository. |
2755 This command is now deprecated and will be removed in a future |
2755 This command is now deprecated and will be removed in a future |
2756 release. Please use the rollback command instead. For usage |
2756 release. Please use the rollback command instead. For usage |
2757 instructions, see the rollback command. |
2757 instructions, see the rollback command. |
2758 """ |
2758 """ |
2759 ui.warn(_('(the undo command is deprecated; use rollback instead)\n')) |
2759 ui.warn(_('(the undo command is deprecated; use rollback instead)\n')) |
2760 repo.undo() |
2760 repo.rollback() |
2761 |
2761 |
2762 def update(ui, repo, node=None, merge=False, clean=False, force=None, |
2762 def update(ui, repo, node=None, merge=False, clean=False, force=None, |
2763 branch=None, **opts): |
2763 branch=None, **opts): |
2764 """update or merge working directory |
2764 """update or merge working directory |
2765 |
2765 |