Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 28324:549ff28a345f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 02 Mar 2016 16:44:56 -0600
parents ffc693f87148 e417e4512b0f
children f6b5b041c6c9
comparison
equal deleted inserted replaced
28323:ffc693f87148 28324:549ff28a345f
1268 @command('branches', 1268 @command('branches',
1269 [('a', 'active', False, 1269 [('a', 'active', False,
1270 _('show only branches that have unmerged heads (DEPRECATED)')), 1270 _('show only branches that have unmerged heads (DEPRECATED)')),
1271 ('c', 'closed', False, _('show normal and closed branches')), 1271 ('c', 'closed', False, _('show normal and closed branches')),
1272 ] + formatteropts, 1272 ] + formatteropts,
1273 _('[-ac]')) 1273 _('[-c]'))
1274 def branches(ui, repo, active=False, closed=False, **opts): 1274 def branches(ui, repo, active=False, closed=False, **opts):
1275 """list repository named branches 1275 """list repository named branches
1276 1276
1277 List the repository's named branches, indicating which ones are 1277 List the repository's named branches, indicating which ones are
1278 inactive. If -c/--closed is specified, also list branches which have 1278 inactive. If -c/--closed is specified, also list branches which have
5232 _('force a merge including outstanding changes (DEPRECATED)')), 5232 _('force a merge including outstanding changes (DEPRECATED)')),
5233 ('r', 'rev', '', _('revision to merge'), _('REV')), 5233 ('r', 'rev', '', _('revision to merge'), _('REV')),
5234 ('P', 'preview', None, 5234 ('P', 'preview', None,
5235 _('review revisions to merge (no merge is performed)')) 5235 _('review revisions to merge (no merge is performed)'))
5236 ] + mergetoolopts, 5236 ] + mergetoolopts,
5237 _('[-P] [-f] [[-r] REV]')) 5237 _('[-P] [[-r] REV]'))
5238 def merge(ui, repo, node=None, **opts): 5238 def merge(ui, repo, node=None, **opts):
5239 """merge another revision into working directory 5239 """merge another revision into working directory
5240 5240
5241 The current working directory is updated with all changes made in 5241 The current working directory is updated with all changes made in
5242 the requested revision since the last common predecessor revision. 5242 the requested revision since the last common predecessor revision.