Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 50262:e27a5a012323

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branch: pass current transaction when writing branch in backout command
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 02 Mar 2023 14:45:29 +0100
parents 774ed116dd7c
children 9fc0d244a753 4a73df6eb67d
comparison
equal deleted inserted replaced
50261:774ed116dd7c 50262:e27a5a012323
835 _(b"use 'hg resolve' to retry unresolved file merges\n") 835 _(b"use 'hg resolve' to retry unresolved file merges\n")
836 ) 836 )
837 return 1 837 return 1
838 else: 838 else:
839 hg.clean(repo, node, show_stats=False) 839 hg.clean(repo, node, show_stats=False)
840 repo.dirstate.setbranch(branch) 840 repo.dirstate.setbranch(branch, repo.currenttransaction())
841 cmdutil.revert(ui, repo, rctx) 841 cmdutil.revert(ui, repo, rctx)
842 842
843 if opts.get(b'no_commit'): 843 if opts.get(b'no_commit'):
844 msg = _(b"changeset %s backed out, don't forget to commit.\n") 844 msg = _(b"changeset %s backed out, don't forget to commit.\n")
845 ui.status(msg % short(node)) 845 ui.status(msg % short(node))