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

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

don't return uninitialized memory from bdiff.blocks()...
don't return uninitialized memory from bdiff.blocks() bdiff.blocks() returns a dummy match at the end of both files; the length of that chunk is never set, so it will sometimes contain random heap garbage. There are apparently workarounds for this elsewhere: # bdiff sometimes gives huge matches past eof, this check eats them,
Vadim Gelfer - - Load All Authors

File last commit:

r2915:013921c7 default
r4131:1ca664c9 default
Show More
test-merge-default
40 lines | 440 B | text/plain | TextLexer
/ tests / test-merge-default
History | Source | Raw |Copy content |Copy permalink
Vadim Gelfer
merge with other head by default, not tip....
 r2915 #!/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 1 head
hg merge
true