##// 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-up-local-change
33 lines | 515 B | text/plain | TextLexer
/ tests / test-up-local-change
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Remove bashisms and use /bin/sh instead of /bin/bash....
 r544 #!/bin/sh
mpm@selenic.com
Add a simple testing framework...
 r331
Thomas Arendsen Hein
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
 r800 set -e
mpm@selenic.com
Add a simple testing framework...
 r331 mkdir r1
cd r1
hg init
echo a > a
hg addremove
mpm@selenic.com
Update tests to use commit -m and default -u...
 r749 hg commit -m "1" -d "0 0"
mpm@selenic.com
Add a simple testing framework...
 r331
mpm@selenic.com
[PATCH] add clone command...
 r485 hg clone . ../r2
cd ../r2
mpm@selenic.com
Add a simple testing framework...
 r331 hg up
echo abc > a
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
Add a simple testing framework...
 r331
cd ../r1
echo b > b
echo a2 > a
hg addremove
mpm@selenic.com
Update tests to use commit -m and default -u...
 r749 hg commit -m "2" -d "0 0"
mpm@selenic.com
Add a simple testing framework...
 r331
cd ../r2
hg -q pull ../r1
hg status
mpm@selenic.com
options: kill -d for debug...
 r591 hg --debug up
hg --debug up -m
mpm@selenic.com
Add a simple testing framework...
 r331 hg parents
hg -v history
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
Add a simple testing framework...
 r331