Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge8 @ 4375:11dc22eb8e8d
Fix segfaults when parsing bdiff hunks in mpatch.decode() and .patchedsize()
- fix off by 11 when checking if there are more hunks (found by Maris Fogels)
- bail out if start is greater than end
- check if new hunk starts after start/end/len block of current hunk as
the pointer can wrap around on very large values, reproducible with
import mpatch; mpatch.patchedsize(12, 'x'*12)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 27 Jan 2007 23:07:06 +0100 |
parents | efbe24c7d8d9 |
children |
line wrap: on
line source
#!/bin/sh # Test for changeset ba7c74081861 # (update dirstate correctly for non-branchmerge updates) hg init a cd a echo a > a hg add a hg commit -m a cd .. hg clone a b cd a hg mv a b hg commit -m move echo b >> b hg commit -m b cd ../b hg pull ../a hg update