##// END OF EJS Templates
update: clarify that -C and -c are mutually exclusive...
Martin von Zweigbergk -
r30964:afaf3c2b default
parent child Browse files
Show More
@@ -5289,7 +5289,7 b' def unbundle(ui, repo, fname1, *fnames, '
5289 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5289 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),
5290 ('r', 'rev', '', _('revision'), _('REV'))
5290 ('r', 'rev', '', _('revision'), _('REV'))
5291 ] + mergetoolopts,
5291 ] + mergetoolopts,
5292 _('[-c] [-C] [-d DATE] [[-r] REV]'))
5292 _('[-C|-c] [-d DATE] [[-r] REV]'))
5293 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5293 def update(ui, repo, node=None, rev=None, clean=False, date=None, check=False,
5294 tool=None):
5294 tool=None):
5295 """update working directory (or switch revisions)
5295 """update working directory (or switch revisions)
@@ -5310,10 +5310,11 b' def update(ui, repo, node=None, rev=None'
5310
5310
5311 .. container:: verbose
5311 .. container:: verbose
5312
5312
5313 The following rules apply when the working directory contains
5313 The -C/--clean and -c/--check options control what happens if the
5314 uncommitted changes:
5314 working directory contains uncommitted changes.
5315
5315 At most of one of them can be specified.
5316 1. If neither -c/--check nor -C/--clean is specified, and if
5316
5317 1. If no option is specified, and if
5317 the requested changeset is an ancestor or descendant of
5318 the requested changeset is an ancestor or descendant of
5318 the working directory's parent, the uncommitted changes
5319 the working directory's parent, the uncommitted changes
5319 are merged into the requested changeset and the merged
5320 are merged into the requested changeset and the merged
General Comments 0
You need to be logged in to leave comments. Login now