Mercurial Mercurial > hg / 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/check-gendoc
author Pulkit Goyal <7895pulkit@gmail.com>
Mon, 08 Jan 2018 19:41:47 +0530
changeset 35704 41ef02ba329b
parent 28809 7a1ad08b9ff5
child 41005 69c99898a48f
permissions -rwxr-xr-x
merge: add `--abort` flag which can abort the merge Currently we don't have a good functionality to abort the merge and tell user to do `hg update -C .` which can leads to different results if user missed the '.' and moreover does not align with other abort functionalities like rebase, shelve etc. This patch adds `hg merge --abort` which will abort the ongoing merge and take us back to the chagneset where we started from. Works in both cases when merge resulted in conflicts and when there were no conflicts. .. feature:: A `--abort` flag to merge command to abort the ongoing merge. Differential Revision: https://phab.mercurial-scm.org/D1829
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
28809
7a1ad08b9ff5 tests: splitting test-gendoc.t into per file tests
timeless <timeless@mozdev.org>
parents: 27733
diff changeset 
     1
 
#!/bin/sh
7a1ad08b9ff5 tests: splitting test-gendoc.t into per file tests
timeless <timeless@mozdev.org>
parents: 27733
diff changeset 
     2
 
HGENCODING=UTF-8
7a1ad08b9ff5 tests: splitting test-gendoc.t into per file tests
timeless <timeless@mozdev.org>
parents: 27733
diff changeset 
     3
 
export HGENCODING
9446
57d682d7d2da test-gendoc: test documentation generation
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset 
     4
 







28809






7a1ad08b9ff5
tests: splitting test-gendoc.t into per file tests



timeless <timeless@mozdev.org>


parents: 
27733

diff
changeset




     5


echo ".. -*- coding: utf-8 -*-" > gendoc.txt













7a1ad08b9ff5
tests: splitting test-gendoc.t into per file tests



timeless <timeless@mozdev.org>


parents: 
27733

diff
changeset




     6


echo "" >> gendoc.txt













7a1ad08b9ff5
tests: splitting test-gendoc.t into per file tests



timeless <timeless@mozdev.org>


parents: 
27733

diff
changeset




     7


LANGUAGE=$1 python "$TESTDIR/../doc/gendoc.py" >> gendoc.txt 2> /dev/null || exit













7a1ad08b9ff5
tests: splitting test-gendoc.t into per file tests



timeless <timeless@mozdev.org>


parents: 
27733

diff
changeset




     8














7a1ad08b9ff5
tests: splitting test-gendoc.t into per file tests



timeless <timeless@mozdev.org>


parents: 
27733

diff
changeset




     9


echo "checking for parse errors"













7a1ad08b9ff5
tests: splitting test-gendoc.t into per file tests



timeless <timeless@mozdev.org>


parents: 
27733

diff
changeset




    10


python "$TESTDIR/../doc/docchecker" gendoc.txt













7a1ad08b9ff5
tests: splitting test-gendoc.t into per file tests



timeless <timeless@mozdev.org>


parents: 
27733

diff
changeset




    11


python "$TESTDIR/../doc/runrst" html gendoc.txt /dev/null















Mercurial