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

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

changelog: refuse to add revisions with empty usernames...
changelog: refuse to add revisions with empty usernames An empty username or a username with a "\n" will make the revision text contain two "\n\n" sequences -> corrupt repository. The problem is that changelog.read expects to find exactly one "\n\n" separator and thus cannot unpack the revision.
Matt Mackall - - Load All Authors

File last commit:

r5710:026eb800 default
r8424:c5b3d3e3 default
Show More
test-merge-types
39 lines | 643 B | text/plain | TextLexer
/ tests / test-merge-types
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init
echo a > a
hg ci -Amadd # 0
chmod +x a
hg ci -mexecutable # 1
hg up 0
rm a
ln -s symlink a
hg ci -msymlink # 2
hg merge --debug
echo % symlink is local parent, executable is other
if [ -h a ]; then
echo a is a symlink
$TESTDIR/readlink.py a
elif [ -x a ]; then
echo a is executable
else
echo "a has no flags (default for conflicts)"
fi
hg update -C 1
hg merge --debug
echo % symlink is other parent, executable is local
if [ -h a ]; then
echo a is a symlink
$TESTDIR/readlink.py a
elif [ -x a ]; then
echo a is executable
else
echo "a has no flags (default for conflicts)"
fi