466                 return hg.update(repo, op1)

   466                 return hg.update(repo, op1)

   467             finally:

   467             finally:

   468                 ui.setconfig('ui', 'forcemerge', '')

   468                 ui.setconfig('ui', 'forcemerge', '')

   469 

   469 

   470         commit_opts = opts.copy()

   470         commit_opts = opts.copy()

   472         if not commit_opts['message'] and not commit_opts['logfile']:

   471         if not commit_opts['message'] and not commit_opts['logfile']:

   473             # we don't translate commit messages

   472             # we don't translate commit messages

   474             commit_opts['message'] = "Backed out changeset %s" % short(node)

   473             commit_opts['message'] = "Backed out changeset %s" % short(node)

   475             commit_opts['force_editor'] = True

   474             commit_opts['force_editor'] = True

   476         commit(ui, repo, **commit_opts)

   475         commit(ui, repo, **commit_opts)