bf3fd9d0f863602da1ecd3b49f137e3515341c7b markd Thu May 16 16:33:00 2019 -0700 allow BED itemRgb field to be name "itemRgb" instead of "reserved" fixes #23499 diff --git src/lib/asParse.c src/lib/asParse.c index e8ae8b3..7f38f4b 100644 --- src/lib/asParse.c +++ src/lib/asParse.c @@ -600,31 +600,32 @@ else if (as1->isSimple != as2->isSimple) { verbose(verboseLevel,"isSimple does not match: %s=[%d] %s=[%d]", name1, as1->isSimple, name2, as2->isSimple); differencesFound = TRUE; } else { if (!as1->isTable) { errAbort("asCompareObjLists only supports Table .as objects at this time."); } for (col1 = as1->columnList, col2 = as2->columnList; col1 != NULL && col2 != NULL && checkCount < numColumnsToCheck; col1 = col1->next, col2 = col2->next, ++checkCount) { - if (!sameOk(col1->name, col2->name)) + // allow reserved fields to become used + if (!(sameOk(col1->name, col2->name) || sameOk(col1->name, "reserved") || sameOk("reserved", col2->name))) { verbose(verboseLevel,"column #%d names do not match: %s=[%s] %s=[%s]\n" , checkCount+1, name1, col1->name, name2, col2->name); differencesFound = TRUE; break; } else if (col1->isSizeLink != col2->isSizeLink) { verbose(verboseLevel,"column #%d isSizeLink do not match: %s=[%d] %s=[%d]\n" , checkCount+1, name1, col1->isSizeLink, name2, col2->isSizeLink); differencesFound = TRUE; break; } else if (col1->isList != col2->isList) {