3831: Childref notes are lost on merging of children, by MD Nauta

svn: r15083
This commit is contained in:
Doug Blank 2010-04-11 13:44:01 +00:00
parent ac4e25bffc
commit 76fbbcaab9

View File

@ -612,6 +612,7 @@ class MergePeople(object):
if child_ref.ref == old_handle: if child_ref.ref == old_handle:
if new_handle not in [ref.ref for ref in new_ref_list]: if new_handle not in [ref.ref for ref in new_ref_list]:
new_ref = gen.lib.ChildRef() new_ref = gen.lib.ChildRef()
new_ref.unserialize(child_ref.serialize())
new_ref.ref = new_handle new_ref.ref = new_handle
new_ref_list.append(new_ref) new_ref_list.append(new_ref)
elif child_ref.ref not in [ref.ref for ref in new_ref_list]: elif child_ref.ref not in [ref.ref for ref in new_ref_list]: