##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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 - - Load All Authors

File last commit:

r981:4f81068e merge default
r990:5007e0bd default
Show More
test-diffdir
14 lines | 308 B | text/plain | TextLexer
/ tests / test-diffdir
History | Source | Raw |Copy content |Copy permalink
mpm@selenic.com
Refactor diffrevs/diffdir into changes...
 r536 #!/bin/sh
hg init
touch a
hg add a
mpm@selenic.com
Update tests to use commit -m and default -u...
 r749 hg ci -m "a" -d "0 0"
mpm@selenic.com
Refactor diffrevs/diffdir into changes...
 r536
echo 123 > b
hg add b
TK Soh
test fixes for Solaris 2.6...
 r949 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
mpm@selenic.com
Refactor diffrevs/diffdir into changes...
 r536
TK Soh
test fixes for Solaris 2.6...
 r949 hg diff -r tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"