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

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

add a fix for issue 1175...
add a fix for issue 1175 If we copy a file followed by an update, it's possible for the parent manifest to no longer contain the source file of the copy, which could cause commit to fail. If this happens, we search backwares from the first parent to find the most likely original revision.
Patrick Mezard - - Load All Authors

File last commit:

r6719:42dbf954 default
r6875:0d714a48 default
Show More
test-commit
106 lines | 2.0 KiB | text/plain | TextLexer
/ tests / test-commit
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
echo % commit date test
hg init test
cd test
echo foo > foo
hg add foo
HGEDITOR=true hg commit -m ""
hg commit -d '0 0' -m commit-1
echo foo >> foo
hg commit -d '1 4444444' -m commit-3
hg commit -d '1 15.1' -m commit-4
hg commit -d 'foo bar' -m commit-5
hg commit -d ' 1 4444' -m commit-6
hg commit -d '111111111111 0' -m commit-7
echo % commit added file that has been deleted
echo bar > bar
hg add bar
rm bar
hg commit -d "1000000 0" -m commit-8
hg commit -d "1000000 0" -m commit-8-2 bar
hg -q revert -a --no-backup
mkdir dir
echo boo > dir/file
hg add
hg -v commit -d '0 0' -m commit-9 dir
echo > dir.file
hg add
hg commit -d '0 0' -m commit-10 dir dir.file
echo >> dir/file
mkdir bleh
mkdir dir2
cd bleh
hg commit -d '0 0' -m commit-11 .
hg commit -d '0 0' -m commit-12 ../dir ../dir2
hg -v commit -d '0 0' -m commit-13 ../dir
cd ..
hg commit -d '0 0' -m commit-14 does-not-exist
ln -s foo baz
hg commit -d '0 0' -m commit-15 baz
touch quux
hg commit -d '0 0' -m commit-16 quux
echo >> dir/file
hg -v commit -d '0 0' -m commit-17 dir/file
cd ..
echo % partial subdir commit test
hg init test2
cd test2
mkdir foo
echo foo > foo/foo
mkdir bar
echo bar > bar/bar
hg add
hg ci -d '1000000 0' -u test -m commit-subdir-1 foo
hg ci -d '1000001 0' -u test -m commit-subdir-2 bar
echo % subdir log 1
hg log -v foo
echo % subdir log 2
hg log -v bar
echo % full log
hg log -v
cd ..
echo % dot and subdir commit test
hg init test3
cd test3
mkdir foo
echo foo content > foo/plain-file
hg add foo/plain-file
hg ci -d '1000000 0' -u test -m commit-foo-subdir foo
echo modified foo content > foo/plain-file
hg ci -d '2000000 0' -u test -m commit-foo-dot .
echo % full log
hg log -v
echo % subdir log
cd foo
hg log .
cd ..
cd ..
cd ..
hg init issue1049
cd issue1049
echo a > a
hg ci -Ama
echo a >> a
hg ci -mb
hg up 0
echo b >> a
hg ci -mc
HGMERGE=true hg merge
echo % should fail because we are specifying a file name
hg ci -mmerge a
echo % should fail because we are specifying a pattern
hg ci -mmerge -I a
echo % should succeed
hg ci -mmerge
exit 0