view tests/test-gendoc-zh_CN.t @ 36927:17a744c5e270

rebase: also include commit of collapsed commits in single transaction When rebase.singletransaction is set, we still used to create a second transaction when committing with --collapse. It's simpler to create a single transaction. Note that in the affected .t file, the test that uses --collapse still appears to create two transactions (it prints "rebase status stored" twice). However, only a single transaction is actually created and the second printout comes from cmdutil.commitforceeditor() that explicitly calls tr.writepending(). Also note the that we now roll back any commits if the user closes the commit message editor with an error code (or leaves the message empty). That might be unfortunate, but it's consistent with how we behave in the --no-collapse case (if the user passed --edit). If we want to change that, I think it should be done consistently in a separate patch. Differential Revision: https://phab.mercurial-scm.org/D2728
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 09 Mar 2018 10:35:48 -0800
parents 7a1ad08b9ff5
children
line wrap: on
line source

#require docutils gettext

  $ $TESTDIR/check-gendoc zh_CN
  checking for parse errors