Mercurial > hg

annotate tests/README @ 29774:a7f8939641aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use labels in prompts to the user Now that we persist the labels, we can consistently use the labels in prompts for the user without risk of confusion. This changes a huge amount of command output: This means that merge prompts like: no tool found to merge a keep (l)ocal, take (o)ther, or leave (u)nresolved? u and remote changed a which local deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c become: no tool found to merge a keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved? u and remote [source] changed a which local [dest] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c where "working copy" and "destination" were supplied by the command that requested the merge as labels for conflict markers, and thus should be human-friendly.
author Simon Farnsworth <simonfar@fb.com>
date Fri, 12 Aug 2016 06:01:42 -0700
parents 4b0fc75f9403
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
332
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
1 To run the tests, do:
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
2
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
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
6c869059beb4 testing fixups
mpm@selenic.com
parents: 331
diff changeset
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.