Stream: committers
Topic: VScache
Alexander Henket (Jul 21 2016 at 12:49):
Would it be an idea to add the build/vscache folder to the ignore list? It leads to a lot of pseudo changes.
Grahame Grieve (Jul 21 2016 at 13:11):
no that would be bad idea indeed.
Grahame Grieve (Jul 21 2016 at 13:11):
I'm still working on why it changes
Rob Hausam (Jul 21 2016 at 13:12):
Yes, it still changes, with fairly frequent tree conflicts for me, but not as much as it did in the past.
Grahame Grieve (Feb 09 2018 at 21:06):
Committers: Josh and I had a long thread about the vscache files, which are potentially a problem once we start trying to merge on Git. In principle, there should be no merge conflicts in the vscache files, if, that is, you always build before committing any binding or value set changes, and everyone always commits any changes to vscache along with any other changes,
Grahame Grieve (Feb 09 2018 at 21:06):
for now, if you get any conflicts in vscache, please let me know, and I'll investigate
Josh Mandel (Feb 09 2018 at 21:09):
So one thing we should be able to verify during our Travis CI run is... if you submit a PR, and we run the Travis build on your PR... the contents of vscache shouldn't change during this build. If they do, the build should fail. Is that correct @Grahame Grieve ?
Grahame Grieve (Feb 09 2018 at 21:39):
I think it is. under the current rules that should be the case
Josh Mandel (Feb 09 2018 at 21:47):
Should I add this to our Travis build rules now?
Grahame Grieve (Feb 09 2018 at 21:54):
yes, lets do that and see if it throws anything up
Eric Haas (Feb 09 2018 at 23:19):
This means to all you commiters out there like me who have bad habits of not ever committing vscache is we got to change are lazy ways.
Lloyd McKenzie (Feb 10 2018 at 02:47):
Does that mean we commit when the loinc and snomed files change too?
Grahame Grieve (Feb 10 2018 at 03:33):
yes
Rob Hausam (Feb 11 2018 at 07:14):
For what it's worth, I just got this:
Updated to revision 13036.
Summary of conflicts:
Text conflicts: 2
Conflict discovered in file 'vscache/validation.cache/not-supported.txt'.
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
(mc) my side of conflict, (tc) their side of conflict,
(s) show all options: tc
Resolved conflicted state of 'vscache/validation.cache/not-supported.txt'
Conflict discovered in file 'vscache/validation.cache/observation-vitalsignresult.json'.
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
(mc) my side of conflict, (tc) their side of conflict,
(s) show all options: tc
Resolved conflicted state of 'vscache/validation.cache/observation-vitalsignresult.json'
Summary of conflicts:
Text conflicts: 0 remaining (and 2 already resolved)
Grahame Grieve (Feb 11 2018 at 10:52):
so you got that when - commit after build?
Rob Hausam (Feb 11 2018 at 15:50):
That was on updating to rev 13036 after a previously successful full build of 12986 - with no local changes made in between.
Grahame Grieve (Feb 11 2018 at 20:42):
Ok let me know if you get more from here on in
Rob Hausam (Feb 13 2018 at 15:56):
Here it is again:
RHausamMacbookPro:build rhausam$ svn update
Updating '.':
U vscache/-549964864.json
U vscache/-2000789476.json
U vscache/-1818422447.json
C vscache/validation.cache/not-supported.txt
U vscache/212986741.json
U guides/cqif/cqif-knowledge-artifact-representation.html
G source/nutritionorder/nutritionorder-spreadsheet.xml
U source/immunizationrecommendation/immunizationrecommendation-spreadsheet.sheet.txt
U source/immunizationrecommendation/immunizationrecommendation-spreadsheet.xml
U source/compartments.xml
U source/immunizationevaluation/immunizationevaluation-spreadsheet.xml
U source/immunizationevaluation/immunizationevaluation-notes.xml
U source/immunizationevaluation/immunizationevaluation-spreadsheet.sheet.txt
U source/immunization/immunization-spreadsheet.xml
A source/immunization/valueset-immunization-function.xml
A source/immunization/immunization-example-subpotent.xml
U source/immunization/valueset-immunization-reason.xml
A source/immunization/codesystem-immunization-subpotent-reason.xml
U source/immunization/immunization-example-refused.xml
U source/immunization/immunization-spreadsheet.sheet.txt
A source/immunization/valueset-immunization-status-reason.xml
U source/immunization/valueset-immunization-route.xml
U source/immunization/immunization-example.xml
A source/immunization/valueset-immunization-subpotent-reason.xml
U source/suppressed-workflow-warnings.xml
Updated to revision 13041.
Summary of conflicts:
Text conflicts: 1
Conflict discovered in file 'vscache/validation.cache/not-supported.txt'.
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
(mc) my side of conflict, (tc) their side of conflict,
(s) show all options: df
--- vscache/validation.cache/not-supported.txt.r13041 - THEIRS
+++ vscache/validation.cache/not-supported.txt - MERGED
@@ -1,18 +1,192 @@
+<<<<<<< .mine
+http://hl7.org/fhir/pharmacy-information
+http://hl7.org/fhir/object-type
+https://precision.fda.gov/jobs/
+http://hl7.org/fhir/provider-qualification
+http://goodhealthhospital.org/supplement-type-codes
+http://hl7.org/fhir/pharmacy-refill
+http://fdi.org/fhir/oralsurfacecodes
+http://hl7.org/fhir/v3/ActIncidentCode
+http://snomed.info/id
+http://snomed.info/sct/32506021000036107/version/20170403
+http://hl7.org/fhir/pharmacy-form
+http://snomed/sct
+https://precision.fda.gov/files/
+http://hl7.org/fhir/sid/ndc
+http://hl7.org/fhir/ex-visionservice
+http://pharmakb.org
+http://nehta.gov.au/codes/medications/changetype
+urn:ietf:bcp:13
+http://hl7.org/fhir/vaccination-protocol-dose-status
+urn:uuid:a54d6aa5-d40d-43f9-88c5-b4633d873bdd
+http://usextension/snomed.info/sct
+https://precision.fda.gov/apps/
+http:hl7.org/fhir/ValueSet/v3-ActPharmacySupplyType
+http://ihe.net/connectathon/practiceSettingCodes
+http://national.org/form
+http://acme.org/tests
+https://meshb.nlm.nih.gov
+https://www.cms.gov/medicare/coding/place-of-service-codes/place_of_service_code_set.html
+http://ncforms.org/formid
+http:/acme.ped/apgarheartrate
+http://acme-rehab.org
+http:/acme.ec/codes
+http://acme.org/messagetypes
+http://acme.org/lab/codes/flags
+urn:ietf:bcp:47
+http://www.radlex.org
+http://hl7.org/fhir/sid/icd-10
+http://fdi.org/fhir/oraltoothcodes
+http://hl7.org/fhir/vaccination-protocol-dose-status-reason
+http://hl7.org/fhir/immunization-recommendation-date-criterion
+http://hl7.org/fhir/ValeSet/med-dispense-perform-function
+http://hl7.org/fhir/sid/cvx
+urn:ietf:rfc:3986
+https://system/PGxReport
+https://rtmms.nist.gov
+http://www.ncbi.nlm.nih.gov/nuccore
+http://www.genenames.org
+http://hl7.org/fhir/claim-careteamrole
+http://org.mdhhs.fhir.consent-signer-type
+http://sonomacounty.ca.gov/Health/Public-Health/Laboratory/test-codes
+http://snomed.info.sct
+https://github.com/common-workflow-language/workflows
+https://www.cms.gov/codes/billtype
+http://nucc.org/provider-taxonomy
+http://www.ihe.net/xds/connectathon/practiceSettingCodes
+http://hl7.org/fhir/contract-term-type
+http://www.ebi.ac.uk/ipd/imgt/hla
+http://acme.lab
+https://www.usps.com/
+http://ihe.net/xds/connectathon/classCodes
+http://acme.org/lab/codes/panels
+http://acme.org/lab/codes/tests
+http://hl7.org/fhir/sid/icd-10-cm
+https://www.acmeonline.com
+http://acme.org/lab/codes/organisms
+http://orionhealth.com/fhir/apps/specialties
+http://org.mdhhs.fhir.consent-actor-type
+https://hive.biochemistry.gwu.edu
+http://cancer.questionnaire.org/system/code/yesno
+https://vetmed.iastate.edu/vdl
+http://goodhealthhospital.org/diet-type-codes
+urn:iso:std:iso:11073:10101
+http://hl7.org/fhir/sid/icd-9
+http://hl7.org/fhir/c80-doc-typecodes
+http://ihe.net/xds/connectathon/eventCodes
+http://localdruglist.org
+http://samplevisionreasoncodes.com
+http:/acme.ped/apgarmuscletone
+http:/acme.ped/apgarreflexirritability
+http://hl7.org/fhir/RxNorm
+http://www.ensembl.org
+http://www.infoway-inforoute.ca.org/Consent-subtype-codes
+https://intranet.aumc.nl/labtestcodes
+http://acmelabs.org
+http://hl7.org/fhir/ValueSet/account-type
+http://hl7.org/fhir/animal-breed
+http:/acme.ped/apgarcolor
+https://www.ncbi.nlm.nih.gov/nuccore
+http://hl7.org/fhir/patient-contact-relationship
+http://hl7.org/fhir/coverage-level-rx
+https://www.aphis.usda.gov
+http://nema.org/examples/gender
+https://acme.org/codes
+||||||| .r13036
+https://www.usps.com/
+http://hl7.org/fhir/pharmacy-information
+https://precision.fda.gov/jobs/
+http://hl7.org/fhir/provider-qualification
+http://hl7.org/fhir/pharmacy-refill
+http://fdi.org/fhir/oralsurfacecodes
+http://hl7.org/fhir/v3/ActIncidentCode
+http://snomed.info/id
+http://snomed.info/sct/32506021000036107/version/20170403
+http://hl7.org/fhir/pharmacy-form
+urn:iso:std:iso:11073:10101
+https://precision.fda.gov/files/
+http://hl7.org/fhir/ex-visionservice
+http://pharmakb.org
+http://localdruglist.org
+http:/acme.ped/apgarmuscletone
+http:/acme.ped/apgarreflexirritability
+http://hl7.org/fhir/RxNorm
+urn:ietf:bcp:13
+http://www.ensembl.org
+https://intranet.aumc.nl/labtestcodes
+http://acmelabs.org
+https://precision.fda.gov/apps/
+http://hl7.org/fhir/ValueSet/account-type
+http://hl7.org/fhir/animal-breed
+https://www.cms.gov/medicare/coding/place-of-service-codes/place_of_service_code_set.html
+http:/acme.ped/apgarcolor
+http:/acme.ped/apgarheartrate
+http://acme-rehab.org
+https://www.ncbi.nlm.nih.gov/nuccore
+http:/acme.ec/codes
+http://hl7.org/fhir/patient-contact-relationship
+urn:ietf:bcp:47
+http://hl7.org/fhir/sid/icd-10
+http://fdi.org/fhir/oraltoothcodes
+http://nema.org/examples/gender
+http://hl7.org/fhir/sid/cvx
+=======
urn:iso:std:iso:11073:10101
+>>>>>>> .r13041
http://unstats.un.org/unsd/methods/m49/m49.htm
-urn:ietf:rfc:3986
https://www.usps.com/
https://www.census.gov/geo/reference/
+<<<<<<< .mine
+http://build.fhir.org/codesystem-usage-context-type
+http://sonomacounty.ca.gov/Health/Public-Health/Laboratory/result-codes
+||||||| .r13036
+http://sonomacounty.ca.gov/Health/Public-Health/Laboratory/result-codes
+=======
http://hl7.org/fhir/ValueSet/account-type
https://precision.fda.gov/files/
https://precision.fda.gov/jobs/
+>>>>>>> .r13041
+<<<<<<< .mine
+http://www.ncbi.nlm.nih.gov/gtr/
+http:hl7.org/fhir
+http://browser.ihtsdotools.org/
+http://ihe.net/connectathon/classCodes
+http://www.ihe.net/xds/connectathon/healthcareFacilityTypeCodes
+https://www.cms.gov/Outreach-and-Education/Medicare-Learning-Network-MLN/MLNMattersArticles/downloads/SE0801.pdf
+||||||| .r13036
http://www.ncbi.nlm.nih.gov/nuccore
+http://www.genenames.org
+http://browser.ihtsdotools.org/
+http://hl7.org/fhir/claim-careteamrole
+http://sonomacounty.ca.gov/Health/Public-Health/Laboratory/test-codes
+https://www.cms.gov/Outreach-and-Education/Medicare-Learning-Network-MLN/MLNMattersArticles/downloads/SE0801.pdf
+=======
+http://www.ncbi.nlm.nih.gov/nuccore
urn:ietf:bcp:47
+>>>>>>> .r13041
+https://acme.org/identifiers
urn:iso:std:iso:3166
+<<<<<<< .mine
+||||||| .r13036
+https://www.cms.gov/codes/billtype
+=======
urn:ietf:bcp:13
http://www.ensembl.org
+>>>>>>> .r13041
http://example.com
-http://nucc.org/provider-taxonomy
+<<<<<<< .mine
+http://hl7.org/fhir/service-uscls
+http://www.ama-assn.org/go/cpt
+http://snomed.info
+http://hl7.org.fhir/substance-category
+http://acme.org/devices/clinical-codes
+http://org.mdhhs.fhir.consentdirective-type
+http://www.ncbi.nlm.nih.gov/nuccore/||||||| .r13036
+http://hl7.org/fhir/service-uscls
+http://www.ama-assn.org/go/cpt
+http://snomed.info
+http://acme.lab
+http://acme.org/devices/clinical-codes=======
http://hl7.org/fhir/vaccination-protocol-dose-status
http://hl7.org/fhir/sid/icd-10
http://snomed.info/sct/32506021000036107/version/20170403
@@ -19,4 +193,4 @@
http://hl7.org/fhir/vaccination-protocol-dose-status-reason
https://precision.fda.gov/apps/
http://hl7.org/fhir/immunization-recommendation-date-criterion
-http://hl7.org/fhir/sid/cvx
\ No newline at end of file
+http://hl7.org/fhir/sid/cvx>>>>>>> .r13041
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
(r) mark resolved, (mc) my side of conflict,
(tc) their side of conflict, (s) show all options: tc
Resolved conflicted state of 'vscache/validation.cache/not-supported.txt'
Summary of conflicts:
Text conflicts: 0 remaining (and 1 already resolved)
RHausamMacbookPro:build rhausam$
Last updated: Apr 12 2022 at 19:14 UTC
