Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge9 @ 5369:7530334bf301
revlog: generate trivial deltas against null revision
To avoid extra memory usage and performance issues with large files,
generate a trivial delta header for deltas against the null revision
rather than calling the usual delta generator.
We append the delta header to meta rather than prepending it to data
to avoid a large allocate and copy.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 03 Oct 2007 17:17:27 -0500 |
parents | dc5920ea12f8 |
children |
line wrap: on
line source
#!/bin/sh # test that we don't interrupt the merge session if # a file-level merge failed hg init repo cd repo echo foo > foo echo a > bar hg ci -Am 'add foo' -d '0 0' hg mv foo baz echo b >> bar echo quux > quux1 hg ci -Am 'mv foo baz' -d '0 0' hg up -qC 0 echo >> foo echo c >> bar echo quux > quux2 hg ci -Am 'change foo' -d '0 0' # test with the rename on the remote side HGMERGE=false hg merge # test with the rename on the local side hg up -C 1 HGMERGE=false hg merge true