Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge2 @ 4131:1ca664c964e0
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,
| author | Erling Ellingsen <erlingalf@gmail.com> |
|---|---|
| date | Tue, 20 Feb 2007 22:20:16 +0100 |
| parents | 9dcf9d45cab8 |
| children |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -m "commit #0" -d "1000000 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "1000000 0" rm b hg update 0 echo This is file b2 > b hg add b hg commit -m "commit #2" -d "1000000 0" cd ..; rm -r t mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -m "commit #0" -d "1000000 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "1000000 0" rm b hg update 0 echo This is file b2 > b hg commit -A -m "commit #2" -d "1000000 0" cd ..; rm -r t mkdir t cd t hg init echo This is file a1 > a hg add a hg commit -m "commit #0" -d "1000000 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "1000000 0" rm b hg remove b hg update 0 echo This is file b2 > b hg commit -A -m "commit #2" -d "1000000 0"