tests/test-contrib-emacs.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Sat, 12 Dec 2020 19:35:08 +0100
changeset 46607 c19c662097e1
parent 45460 814c7430f828
permissions -rw-r--r--
copies: detect case when a merge decision overwrite previous data We now detect and record when a merge case required special logic (eg: thing that append during the merge, ambiguity leading to picking p1 data, etc) and we explicitly mark the result as superseding the previous data. This fixes the family of test we previously added. Differential Revision: https://phab.mercurial-scm.org/D9613
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
41797
19979b8b87e2 tests: add test for hg-test-mode emacs code
Augie Fackler <augie@google.com>
parents:
diff changeset
     1
#require emacs
19979b8b87e2 tests: add test for hg-test-mode emacs code
Augie Fackler <augie@google.com>
parents:
diff changeset
     2
  $ emacs -q -no-site-file -batch -l $TESTDIR/../contrib/hg-test-mode.el \
19979b8b87e2 tests: add test for hg-test-mode emacs code
Augie Fackler <augie@google.com>
parents:
diff changeset
     3
  >  -f ert-run-tests-batch-and-exit
19979b8b87e2 tests: add test for hg-test-mode emacs code
Augie Fackler <augie@google.com>
parents:
diff changeset
     4
  Running 1 tests (*) (glob)
45460
814c7430f828 tests: make emacs test less strict
Martin von Zweigbergk <martinvonz@google.com>
parents: 41797
diff changeset
     5
     passed  1/1  hg-test-mode--compilation-mode-support* (glob)
41797
19979b8b87e2 tests: add test for hg-test-mode emacs code
Augie Fackler <augie@google.com>
parents:
diff changeset
     6
  
45460
814c7430f828 tests: make emacs test less strict
Martin von Zweigbergk <martinvonz@google.com>
parents: 41797
diff changeset
     7
  Ran 1 tests, 1 results as expected* (glob)
41797
19979b8b87e2 tests: add test for hg-test-mode emacs code
Augie Fackler <augie@google.com>
parents:
diff changeset
     8