Mercurial > evolve
comparison tests/test-exchange-obsmarkers-case-B1.t @ 5135:731b5a89a784
touch: allow divergence with -A even if allowdivergence=no
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 | e6bea259c227 |
| children | 98941c28f3e2 |
comparison
equal
deleted
inserted
replaced
| 5134:d9b1336f7d1c | 5135:731b5a89a784 |
|---|