Mercurial > evolve

diff tests/test-obsolete-push.t @ 5136:bbf33d5f32ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
touch: allow divergence with -A even if allowdivergence=no This is a phase-divergent update to 731b5a89a784. 1f92a6aa40d6 (evolve: add pre-check logic for content-divergence in rewriteutil.precheck(), 2019-11-04) taught `rewriteutil.precheck()` to check for divergence. It also set allowdivergence=yes in test-touch.t to silence the error. However, if one does *not* have that set, it is no longer possible to allow divergence with `hg touch -A`. This patch fixes that.
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 04 Feb 2020 16:22:40 -0800
parents b7b6a4524ef7
children a2fdbece7ce1 a1dad44fe3da
line wrap: on
line diff