Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 906:c711930cf15d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update synopsis for 'hg update', too.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 15 Aug 2005 06:18:49 +0100
parents 65763ff9fa53
children 652507dc9fce 891b6a262c4b
comparison
equal deleted inserted replaced
905:65763ff9fa53 906:c711930cf15d
1356 "^update|up|checkout|co": 1356 "^update|up|checkout|co":
1357 (update, 1357 (update,
1358 [('b', 'branch', "", 'checkout the head of a specific branch'), 1358 [('b', 'branch', "", 'checkout the head of a specific branch'),
1359 ('m', 'merge', None, 'allow merging of conflicts'), 1359 ('m', 'merge', None, 'allow merging of conflicts'),
1360 ('C', 'clean', None, 'overwrite locally modified files')], 1360 ('C', 'clean', None, 'overwrite locally modified files')],
1361 'hg update [-m] [-C] [REV]'), 1361 'hg update [-b TAG] [-m] [-C] [REV]'),
1362 "verify": (verify, [], 'hg verify'), 1362 "verify": (verify, [], 'hg verify'),
1363 "version": (show_version, [], 'hg version'), 1363 "version": (show_version, [], 'hg version'),
1364 } 1364 }
1365 1365
1366 globalopts = [('v', 'verbose', None, 'verbose mode'), 1366 globalopts = [('v', 'verbose', None, 'verbose mode'),