tests/test-gendoc-da.t
author Phil Cohen <phillco@fb.com>
Wed, 27 Dec 2017 17:38:28 -0600
changeset 35701 c5d220a621e7
parent 28809 7a1ad08b9ff5
permissions -rw-r--r--
rebase: don't run IMM if running rebase in a transaction Some callers to rebase.rebase(), like `_moverelative` in `fbamend/movement.py`, wrap the entire rebase call in a transaction. This raises havoc when IMM tries to retry the rebase when it hits merge conflicts, because the abort will fail the whole transaction, not the subset. It also fails at the end, losing any conflict resolution, as @sid0 noticed. The right long-term fix that @quark and I have discussed is to change the restarting logic such that it doesn't abort at all, but simply switches between IMM and non-IMM fluidly for each commit, which has other nice properties. In the meantime this will do for now. Differential Revision: https://phab.mercurial-scm.org/D1782
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
28809
7a1ad08b9ff5 tests: splitting test-gendoc.t into per file tests
timeless <timeless@mozdev.org>
parents:
diff changeset
     1
#require docutils gettext
7a1ad08b9ff5 tests: splitting test-gendoc.t into per file tests
timeless <timeless@mozdev.org>
parents:
diff changeset
     2
7a1ad08b9ff5 tests: splitting test-gendoc.t into per file tests
timeless <timeless@mozdev.org>
parents:
diff changeset
     3
  $ $TESTDIR/check-gendoc da
7a1ad08b9ff5 tests: splitting test-gendoc.t into per file tests
timeless <timeless@mozdev.org>
parents:
diff changeset
     4
  checking for parse errors