Mercurial > hg
annotate tests/README @ 27954:9960b6369e7f stable
backout: disable --merge with --no-commit (issue4874)
Because "backout --merge" have to make a commit before merging, it doesn't
work with --no-commit. We could change "backout --merge" to make a merge
commit automatically, and --no-commit to bypass a merge commit, but that
change would be undesirable because:
a) it's hard to fix bad merges in general
b) two commits would be created with the same --message
So, this patch simply disables "--merge --no-commit".
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 30 Jan 2016 18:00:11 +0900 |
parents | 4b0fc75f9403 |
children |
rev | line source |
---|---|
332 | 1 To run the tests, do: |
2 | |
3 cd tests/ | |
2207
8a2a7f7d9df6
Delete the shell version of run-tests
Stephen Darnell <stephen@darnell.plus.com>
parents:
1933
diff
changeset
|
4 python run-tests.py |
332 | 5 |
26421
4b0fc75f9403
urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents:
8936
diff
changeset
|
6 See https://mercurial-scm.org/wiki/WritingTests for |
3934
d0bbd8ee50c7
Move test suite docs to the wiki
Matt Mackall <mpm@selenic.com>
parents:
3199
diff
changeset
|
7 more information on writing tests. |