Mercurial > hg

annotate tests/README @ 23444:88629daa727b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: demonstrate that directory renames can lose local file content When a directory has been renamed on the local branch and a file has been added in the old location on a remote branch, we move that new file to the new location. Unfortunately, if there is already a file there, we overwrite it with the contents from the remote branch. For untracked local files, we should probably abort, and for tracked local files, we should merge the contents. To start with, let's add a test to demonstrate the breakage. Also note that while files merged in from a remote branch are normally (and unintuitively) reported as modified, these files are reported as added.
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 02 Dec 2014 13:28:07 -0800
parents 1de6e7e1bb9f
children 4b0fc75f9403
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
8936
1de6e7e1bb9f change wiki/bts URLs to point to new hostname
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 3934
diff changeset
6 See http://mercurial.selenic.com/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.