debian/compat
author Martin von Zweigbergk <martinvonz@google.com>
Tue, 04 Feb 2020 16:22:40 -0800
changeset 5136 bbf33d5f32ef
parent 4912 43e9bb4de6b5
permissions -rw-r--r--
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4912
43e9bb4de6b5 debian: update debhelper compat
Denis Laxalde <denis@laxalde.org>
parents: 531
diff changeset
     1
10