Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-rename-merge1.out @ 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 | f191bc3916f7 |
| children | 17ed9b9a0d03 |
line wrap: on
line source
checkout 2 files updated, 0 files merged, 2 files removed, 0 files unresolved merge resolving manifests overwrite None partial False ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2 a2: divergent renames -> dr a: remote moved to b -> m b2: remote created -> g copying a to b merging a and b my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c removing a warning: detected divergent renames of a2 to: c2 b2 getting b2 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) M b a M b2 R a C c2 blahblah rev offset length base linkrev nodeid p1 p2 0 0 67 0 1 dc51707dfc98 000000000000 000000000000 1 67 72 1 3 b2494a44f0a9 000000000000 dc51707dfc98 b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66