Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-copy-move-merge.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 | 8d9bdcbb2b18 |
| children | 17ed9b9a0d03 |
line wrap: on
line source
1 files updated, 0 files merged, 2 files removed, 0 files unresolved resolving manifests overwrite None partial False ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0 a: remote moved to c -> m a: remote moved to b -> m copying a to b copying a to c merging a and b my a@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052 removing a merging a and c my a@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052 0 files updated, 2 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -- b -- 0 1 2 -- c -- 0 1 2