From: Benoît Fontaine Date: Sun, 4 Mar 2018 15:59:19 +0000 (+0100) Subject: Fix conflict between GEDCOMs with and without -m option X-Git-Url: https://git.nutra.tk/v1?a=commitdiff_plain;h=105b894c203a350be31f06805d33c13d7c18c7e3;p=gamesguru%2Fgetmyancestors.git Fix conflict between GEDCOMs with and without -m option --- diff --git a/mergemyancestors.py b/mergemyancestors.py index 2582d6f..b91c841 100755 --- a/mergemyancestors.py +++ b/mergemyancestors.py @@ -381,10 +381,14 @@ if __name__ == '__main__': tree.fam[(husb, wife)] = Fam(husb, wife, tree, fam_counter) tree.fam[(husb, wife)].tree = tree tree.fam[(husb, wife)].chil_fid |= ged.fam[num].chil_fid - tree.fam[(husb, wife)].fid = ged.fam[num].fid - tree.fam[(husb, wife)].facts = ged.fam[num].facts - tree.fam[(husb, wife)].notes = ged.fam[num].notes - tree.fam[(husb, wife)].sources = ged.fam[num].sources + if ged.fam[num].fid: + tree.fam[(husb, wife)].fid = ged.fam[num].fid + if ged.fam[num].facts: + tree.fam[(husb, wife)].facts = ged.fam[num].facts + if ged.fam[num].notes: + tree.fam[(husb, wife)].notes = ged.fam[num].notes + if ged.fam[num].sources: + tree.fam[(husb, wife)].sources = ged.fam[num].sources tree.fam[(husb, wife)].sealing_spouse = ged.fam[num].sealing_spouse # merge notes by text