Fix conflict between GEDCOMs with and without -m option

diff --git a/mergemyancestors.py b/mergemyancestors.py
index 2582d6f46eefc926959bc0ce95b3a9653ff2045c..b91c8411def0666053c01f8ec69a3b89fec602c0 100755 (executable)
--- 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