Mercurial > public > mercurial-scm > python-hglib

annotate test.py @ 173:8c4d24b58c23 2.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: adjust test-merge for mercurial 3.7 As of changeset 88d5db4b155c, the noninteractive handler for merge leaves conflicting files unresolved.
author Julien Cristau <julien.cristau@logilab.fr>
date Fri, 19 Feb 2016 19:16:30 +0100
parents 37307caccf54
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
76
37307caccf54 add a script to run tests with nose plugins loaded
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
1 #!/usr/bin/env python
37307caccf54 add a script to run tests with nose plugins loaded
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
2
37307caccf54 add a script to run tests with nose plugins loaded
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
3 import nose
37307caccf54 add a script to run tests with nose plugins loaded
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
4 from tests import with_hg
37307caccf54 add a script to run tests with nose plugins loaded
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
5
37307caccf54 add a script to run tests with nose plugins loaded
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
6 if __name__ == '__main__':
37307caccf54 add a script to run tests with nose plugins loaded
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
7 nose.main(addplugins=[with_hg.WithHgPlugin()])