Mercurial > hg

changeset 29018:602cc9bf036e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 27 Apr 2016 14:02:54 -0700
parents 07be86828e79
children 210bb28ca4fb
files mercurial/commands.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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,