##// END OF EJS Templates
Fix long-standing excessive file merges...
Fix long-standing excessive file merges Since switching to the multihead approach, we've been creating excessive file-level merges where files are marked as merged with their ancestors. This explicitly checks at commit time whether the two parent versions are linearly related, and if so, reduces the file check-in to a non-merge. Then the file is compared against the remaining parent, and, if equal, skips check-in of that file (as it's not changed). Since we're not checking in all files that were different between versions, we no longer need to mark so many files for merge. This removes most of the 'm' state marking as well. Finally, it is possible to do a tree-level merge with no file-level changes. This will happen if one user changes file A and another changes file B. Thus, if we have have two parents, we allow commit to proceed even if there are no file-level changes.
mpm@selenic.com -
r990:5007e0bd default
Show More
Name Size Modified Last Commit Author
/ tests
README Loading ...
fish-merge Loading ...
run-tests Loading ...
test-backwards-remove Loading ...
test-backwards-remove.out Loading ...
test-bad-pull Loading ...
test-bad-pull.out Loading ...
test-basic Loading ...
test-basic.out Loading ...
test-bdiff Loading ...
test-bdiff.out Loading ...
test-clone Loading ...
test-clone-failure Loading ...
test-clone-failure.out Loading ...
test-clone.out Loading ...
test-conflict Loading ...
test-conflict.out Loading ...
test-copy Loading ...
test-copy.out Loading ...
test-diffdir Loading ...
test-diffdir.out Loading ...
test-empty-dir Loading ...
test-empty-dir.out Loading ...
test-filebranch Loading ...
test-filebranch.out Loading ...
test-flags Loading ...
test-flags.out Loading ...
test-help Loading ...
test-help.out Loading ...
test-hook Loading ...
test-hook.out Loading ...
test-hup Loading ...
test-hup.out Loading ...
test-merge-revert Loading ...
test-merge-revert.out Loading ...
test-merge-revert2 Loading ...
test-merge-revert2.out Loading ...
test-merge1 Loading ...
test-merge1.out Loading ...
test-merge2 Loading ...
test-merge2.out Loading ...
test-merge3 Loading ...
test-merge3.out Loading ...
test-merge4 Loading ...
test-merge4.out Loading ...
test-merge5 Loading ...
test-merge5.out Loading ...
test-merge6 Loading ...
test-merge6.out Loading ...
test-notfound Loading ...
test-notfound.out Loading ...
test-pull Loading ...
test-pull.out Loading ...
test-push-warn Loading ...
test-push-warn.out Loading ...
test-rawcommit1 Loading ...
test-rawcommit1.out Loading ...
test-remove Loading ...
test-simple-update Loading ...
test-simple-update.out Loading ...
test-tag Loading ...
test-tag.out Loading ...
test-tags Loading ...
test-tags.out Loading ...
test-undo Loading ...
test-undo.out Loading ...
test-unrelated-pull Loading ...
test-unrelated-pull.out Loading ...
test-up-local-change Loading ...
test-up-local-change.out Loading ...
test-walk Loading ...
test-walk.out Loading ...

A simple testing framework

To run the tests, do:

cd tests/
./run-tests

This finds all scripts in the test directory named test-* and executes
them. The scripts can be either shell scripts or Python. Each test is
run in a temporary directory that is removed when the test is complete.

A test-<x> succeeds if the script returns success and its output
matches test-<x>.out. If the new output doesn't match, it is stored in
test-<x>.err.

There are some tricky points here that you should be aware of when
writing tests:

- hg commit and hg up -m want user interaction

for commit use -m "text"
for hg up -m, set HGMERGE to something noninteractive (like true or merge)

- changeset hashes will change based on user and date which make
things like hg history output change

use commit -m "test" -u test -d "0 0"

- diff will show the current time

use hg diff | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" to strip
dates