view tests/test-rename-merge1.out @ 4946:e8f4e40f285a

convert/subversion: work around memory leak in svn's python bindings The svn.ra.get_log wrapper attaches the hash of changed paths for every log entry to a global memory pool, so memory consumption increases rapidly, with no way to free it. Our workaround is to call this function in a child process, and feed its results back over a pipe. The memory consumption of the child still grows huge (hundreds of megabytes), but at least it goes away once the reading-the-log phase is done.
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 19 Jul 2007 12:41:07 -0700
parents 723e0ddb6ada
children f191bc3916f7
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
merging a and b
my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c
copying a to b
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