##// 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.
Dirkjan Ochtman - - Load All Authors

File last commit:

r8387:50b6af59 default
r8424:c5b3d3e3 default
Show More
test-merge-default
44 lines | 492 B | text/plain | TextLexer
/ tests / test-merge-default
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg init
echo a > a
hg commit -A -ma
echo a >> a
hg commit -mb
echo a >> a
hg commit -mc
hg up 1
echo a >> a
hg commit -md
hg up 1
echo a >> a
hg commit -me
hg up 1
echo % should fail because not at a head
hg merge
hg up
echo % should fail because \> 2 heads
hg merge
echo % should succeed
hg merge 2
hg commit -mm1
echo % should succeed - 2 heads
hg merge
hg commit -mm2
echo % should fail because at tip
hg merge
hg up 0
echo % should fail because 1 head
hg merge
true