Mercurial Mercurial > pub > hg > evolve / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/testlib/docgraph_setup.sh
author Martin von Zweigbergk <martinvonz@google.com>
Tue, 04 Feb 2020 16:22:40 -0800
changeset 5136 bbf33d5f32ef
parent 2959 ef361938dfa1
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:
2959
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
     1
 
. $TESTDIR/testlib/pythonpath.sh
ef361938dfa1 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset 
     2
 












ef361938dfa1
doc: integrate graphviz graphs in tutorials



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




     3


cat >> $HGRCPATH << EOF












ef361938dfa1
doc: integrate graphviz graphs in tutorials



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




     4


[extensions]












ef361938dfa1
doc: integrate graphviz graphs in tutorials



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




     5


docgraph=












ef361938dfa1
doc: integrate graphviz graphs in tutorials



Boris Feld <boris.feld@octobus.net>


parents: 

diff
changeset




     6


EOF














evolve