##// 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,
Thomas Arendsen Hein - - Load All Authors

File last commit:

r3988:9dcf9d45 default
r4131:1ca664c9 default
Show More
test-manifest-merging
34 lines | 582 B | text/plain | TextLexer
/ tests / test-manifest-merging
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
echo % init foo-base
hg init foo-base
echo % create alpha in first repo
cd foo-base
echo 'alpha' > alpha
hg ci -A -m 'add alpha' -d '1 0'
cd ..
echo % clone foo-base to foo-work
hg clone foo-base foo-work
echo % create beta in second repo
cd foo-work
echo 'beta' > beta
hg ci -A -m 'add beta' -d '2 0'
cd ..
echo % create gamma in first repo
cd foo-base
echo 'gamma' > gamma
hg ci -A -m 'add gamma' -d '3 0'
cd ..
echo % pull into work and merge
cd foo-work
hg pull -q
hg merge
echo % revert to changeset 1 to simulate a failed merge
rm alpha beta gamma
hg up -C 1