# HG changeset patch # User Martin von Zweigbergk # Date 1461790974 25200 # Node ID 602cc9bf036ef8ea32c9061234b2e73a056e80e2 # Parent 07be86828e795278abada785da3861b3c38c80e2 update: correct description of --check option The old "update across branches if no uncommitted changes" made it sound like updating across branches (with no uncommitted changes) was allowed only with this option, which was not true. Also, the option did not care whether it was linear or across branches. Instead, it checked that there were no uncommitted changes. Let's explain what it does instead of trying to suggest what happens without it. diff -r 07be86828e79 -r 602cc9bf036e mercurial/commands.py --- a/mercurial/commands.py Tue Apr 26 15:32:59 2016 -0700 +++ b/mercurial/commands.py Wed Apr 27 14:02:54 2016 -0700 @@ -7101,8 +7101,7 @@ @command('^update|up|checkout|co', [('C', 'clean', None, _('discard uncommitted changes (no backup)')), - ('c', 'check', None, - _('update across branches if no uncommitted changes')), + ('c', 'check', None, _('require clean working directory')), ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), ('r', 'rev', '', _('revision'), _('REV')) ] + mergetoolopts,