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

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

fix some rename/copy bugs...
fix some rename/copy bugs - delete copy information when we update dirstate hg was keeping the copy state and marking things as copied on multiple commits - files that are renamed should have no parents if you do a rename/copy to an existing file, it should not be marked as descending from its previous revisions. - remove spurious print from filelog.renamed - add some more copy tests
mpm@selenic.com - - Load All Authors

File last commit:

r981:4f81068e merge default
r1117:30ab5b8e default
Show More
test-up-local-change
33 lines | 515 B | text/plain | TextLexer
/ tests / test-up-local-change
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
set -e
mkdir r1
cd r1
hg init
echo a > a
hg addremove
hg commit -m "1" -d "0 0"
hg clone . ../r2
cd ../r2
hg up
echo abc > a
hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
cd ../r1
echo b > b
echo a2 > a
hg addremove
hg commit -m "2" -d "0 0"
cd ../r2
hg -q pull ../r1
hg status
hg --debug up
hg --debug up -m
hg parents
hg -v history
hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"