Stream: committers
Topic: vscache conflicts
Gaston Fiore (May 25 2016 at 13:29):
Is there a solution to get rid of vscache conflicts? They happen to me very often. For example,
Conflict discovered in '/Users/gafiore/code/fhir/build/vscache/validation.cache/report-codes.json'.
I select the theirs-full option but I'd prefer if we could work out a solution. Thanks!
Gaston Fiore (May 25 2016 at 13:31):
It seems they all happen inside validation.cache.
Grahame Grieve (May 25 2016 at 21:24):
I thought I had sorted this out! can you send me a diff next time please
Gaston Fiore (May 25 2016 at 21:25):
I will, thanks Grahame.
Erich Schulz (May 26 2016 at 05:27):
missing line in .svnignore?
Grahame Grieve (May 26 2016 at 05:31):
no. they need to be in svn. It accelerates your build by about 2 hours
Erich Schulz (May 26 2016 at 05:37):
ah
Grahame Grieve (May 26 2016 at 05:38):
and saves me money on amazon ;-)
Gaston Fiore (May 26 2016 at 20:16):
@Grahame Grieve :
Conflict discovered in '/Users/gafiore/code/fhir-temp/build/vscache/validation.cache/not-supported.txt'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: df
--- /Users/gafiore/code/fhir-temp/build/.svn/pristine/92/926b019fecf07764e47aaeb1386eb122b556711f.svn-base Wed May 25 16:45:27 2016
+++ /Users/gafiore/code/fhir-temp/build/.svn/tmp/not-supported.txt.tmp Thu May 26 16:13:36 2016
@@ -1,44 +1,41 @@
-http://hl7.org/fhir/v2-0276
+http://www.cms.gov/Medicare/Coding/ICD10/index.html
+http://hl7.org/fhir/ValueSet/v3-ActCode
+http://nci.nih.gov/xml/owl/cadsr/data_element_scoped_identifier#3921066v1.0-cs
+http://goodhealthhospital.org/supplement-type-codes
+http://hl7.org/fhir/NamingSystem/hibcc-di
+http://fdi.org/fhir/oralsurfacecodes
http://purl.bioontology.org/ontology/RXNORM/847265
-http:/acme.ec/gcsverbal
-http://acme.org/lab/codes/flags
-http://ihe.net/xds/connectathon/eventCodes
-http://goodhealthhospital.org/diet-type-codes
-http://www.ensembl.org
+http://snomed.info/id
+http://hl7.org/fhir/hspc-assertions
http://snomed/sct
-http://hl7.org/fhir/sid/icd-10
+http://hl7.org/fhir/ex-visionservice
+http:/acme.ec/gcsmotor
http://nehta.gov.au/codes/medications/changetype
-http://www.cms.gov/Medicare/Coding/ICD10/index.html
-http://nci.nih.gov/xml/owl/cadsr/data_element_scoped_identifier#3921081v1.0-cs
-http://hl7.org/fhir/message-type
-http:hl7.org/fhir
-http://hl7.org/fhir/audit-event-sub-type
-http://www.ncbi.nlm.nih.gov/nuccore
-http://www.ihe.net/xds/connectathon/healthcareFacilityTypeCodes
-http://acme.org/messagetypes
-http://www.radlex.org
-http://hl7.org/fhir/ex-visionservice
-http://example.com
-http://hl7.org/fhir/sid/icd-9
-http://acme.lab
-http:/acme.ped/apgarrespiratoryeffort
-http://hl7.org/fhir/hspc-assertions
-http://cancer.questionnaire.org/system/code/yesno
-http://hl7.org/fhir/service-uscls
-http://hl7.org/fhir/ValueSet/patient-contact-relationship
-http://nci.nih.gov/xml/owl/cadsr/data_element_scoped_identifier#3921060v1.0-cs
-http://hl7.org/fhir/NamingSystem/gs1-di
+http://hl7.org/fhir/NamingSystem/iccbba-other-di
+http://cimi.org/vs/attribution/action-method
+urn:uuid:a54d6aa5-d40d-43f9-88c5-b4633d873bdd
+http://www.nucc.org
+http://usextension/snomed.info/sct
+http://www.icd10data.com/icd10pcs
+http://hl7.org/fhir/oralservicecodes
http://hl7.org/fhir/consent-term-type-codes
-http://hl7.org/fhir/ValueSet/v3-ActCode
+http://ihe.net/connectathon/practiceSettingCodes
+http://acme.org/tests
+http://www.fda.gov/Drugs/InformationOnDrugs/ucm142438.htm
+http://hl7.org/fhir/ndfrt
http:/acme.ped/apgarheartrate
-http://goodhealthhospital.org/supplement-type-codes
-urn:uuid:a54d6aa5-d40d-43f9-88c5-b4633d873bdd
-http:/acme.ec/gcsmotor
-http://snomed.org/sct
+http://hl7.org/fhir/NamingSystem/gs1-di
+http://cimi.org/vs/patient/attribution-type
+http://acme.org/messagetypes
+http://acme.org/lab/codes/flags
urn:ietf:bcp:47
+<<<<<<< .mine
+http://www.radlex.org
+=======
http://hl7.org/fhir/familial-relationship
http://hl7.org.fhir/substance-category
http://orionhealth.com/fhir/apps/specialties
+http://loinc.org/la
http://www.cms.gov/Medicare/Coding/ICD9ProviderDiagnosticCodes/codes.html
http://ihe.net/connectathon/practiceSettingCodes
http://hl7.org/fhir/oralservicecodes
@@ -54,50 +51,76 @@
http://orionhealth.com/fhir/apps/prioritycodes
https://intranet.aumc.nl/labtestcodes
http://www.ama-assn.org/go/cpt
+>>>>>>> .r8394
http://AHRQ.org/form/question_identifier#HERF/DE3-cs
-http:/acme.ec/gcseye
-https://rtmms.nist.gov
-http://acme.org
-http://fdi.org/fhir/oralsurfacecodes
-http://cimi.org/vs/attribution/action-method
-http://unstats.un.org/unsd/methods/m49/m49.htm
-http://nema.org/dicom/dicm
-http://ihc.org/fhir/Namespace/cks
-http://www.icd10data.com/icd10pcs
-http://ihe.net/connectathon/classCodes
-http://ihe.net/xds/connectathon/classCodes
-http://hc-sc.gc.ca
+http://hl7.org/fhir/sid/icd-10
http://fdi.org/fhir/oraltoothcodes
http://hl7.org/fhir/NamingSystem/iccbba-blood-di
-https://www.usps.com/
-http://www.infoway-inforoute.ca.org/Consent-subtype-codes
-http:/acme.ped/apgarmuscletone
http://hl7.org/fhir/v3-ActReason
+http://snomed.org/sct
+http://hl7.org/fhir/message-type
+https://rtmms.nist.gov
+http://www.ncbi.nlm.nih.gov/nuccore
+http://www.genenames.org
+http://nci.nih.gov/xml/owl/cadsr/data_element_scoped_identifier#3921060v1.0-cs
+http://hl7.org/fhir/paymenttype
+http://hl7.org/fhir/audit-event-sub-type
+http://www.hgvs.org/mutnomen
http://www.ihe.net/xds/connectathon/practiceSettingCodes
-https://www.census.gov/geo/reference/
-http://hl7.org/fhir/ndfrt
-http://nci.nih.gov/xml/owl/cadsr/data_element_scoped_identifier#3921066v1.0-cs
-http://www.nucc.org
-http://www.ncbi.nlm.nih.gov/projects/SNP
-http://usextension/snomed.info/sct
-http://hl7.org/fhir/NamingSystem/iccbba-other-di
-http://acme.org/tests
-http://www.accessdata.fda.gov/scripts/cder/ndc/dsp_searchresult.cfm
-http://ncimeta.nci.nih.gov
-http://tools.ietf.org/html/bcp47
-http://hl7.org/fhir/paymenttype
-http://hl7.org/fhir/media-method
-http://www.fda.gov/Drugs/InformationOnDrugs/ucm142438.htm
-http://cimi.org/vs/patient/attribution-type
+http://acme.lab
+https://www.usps.com/
+http://ihe.net/xds/connectathon/classCodes
http://acme.org/lab/codes/panels
-http://www.hgvs.org/mutnomen
-http:/acme.ped/apgarcolor
-http://www.genenames.org
+http://acme.org/lab/codes/tests
+http://ihc.org/fhir/Namespace/cks
+http://www.cms.gov/Medicare/Coding/ICD9ProviderDiagnosticCodes/codes.html
http://acme.org/lab/codes/organisms
+http://orionhealth.com/fhir/apps/specialties
+http://cancer.questionnaire.org/system/code/yesno
+http://hl7.org/fhir/v2-0276
+http://goodhealthhospital.org/diet-type-codes
+urn:iso:std:iso:11073:10101
+http://nema.org/dicom/dicm
+http://hl7.org/fhir/sid/icd-9
+http://www.ncbi.nlm.nih.gov/projects/SNP
+http://ehr.goodhealthclinic.org
+http://hl7.org/fhir/c80-doc-typecodes
+http://hl7.org/fhir
+http://hl7.org/fhir/familial-relationship
+http://ihe.net/xds/connectathon/eventCodes
+http:/acme.ec/gcseye
+http://hl7.org/fhir/ValueSet/patient-contact-relationship
+http:/acme.ped/apgarmuscletone
http:/acme.ped/apgarreflexirritability
+http://nci.nih.gov/xml/owl/cadsr/data_element_scoped_identifier#3921081v1.0-cs
+http://www.ensembl.org
+http://www.infoway-inforoute.ca.org/Consent-subtype-codes
+https://intranet.aumc.nl/labtestcodes
+http://acmelabs.org
+http://nci.nih.gov/xml/owl/cadsr/data_element_scoped_identifier#3921085v1.0-cs
+http://www.iana.org/assignments/language-subtag-registry
+http://orionhealth.com/fhir/apps/referraltypes
+http:/acme.ped/apgarcolor
+http://hc-sc.gc.ca
+http://acme.org
+http://hl7.org/fhir/media-method
http://www.nubc.org/patient-discharge
-http://hl7.org/fhir/NamingSystem/hibcc-di
-urn:iso:std:iso:11073:10101
+http://orionhealth.com/fhir/apps/prioritycodes
+http://unstats.un.org/unsd/methods/m49/m49.htm
+http:/acme.ped/apgarrespiratoryeffort
+https://www.census.gov/geo/reference/
+http://loinc.org/la
+http:hl7.org/fhir
+http://ihe.net/connectathon/classCodes
+http://www.ihe.net/xds/connectathon/healthcareFacilityTypeCodes
+http:/acme.ec/gcsverbal
+http://www.accessdata.fda.gov/scripts/cder/ndc/dsp_searchresult.cfm
urn:iso:std:iso:3166
-http://ehr.goodhealthclinic.org
-http://acme.org/lab/codes/tests
\ No newline at end of file
+http://example.com
+http://tools.ietf.org/html/bcp47
+http://hl7.org/fhir/service-uscls
+http://www.ama-assn.org/go/cpt
+http://hl7.org/fhir/ValueSet/http-verb
+http://hl7.org.fhir/substance-category
+http://acme.org/devices/clinical-codes
+http://ncimeta.nci.nih.gov
\ No newline at end of file
Brian Postlethwaite (Jun 08 2016 at 06:59):
Not really a vscache conflict issue, but I get lots of changes t the sheet.txt files which is just in the ordering of the mappings for each of the rows.
don't think that spreadsheets were actually changed for that part, anyone else get this too?
Grahame Grieve (Jun 08 2016 at 08:13):
someone made changes without building, or they decided not to commit the sheet.txt. Committers: you should always commit the .sheet.txt file along with a spreadsheet when you commit
Gaston Fiore (Jun 15 2016 at 18:13):
I'm still always getting problems with validation.cache files. @Grahame Grieve , did you have a chance to take a look:
Conflict discovered in '/Users/gafiore/code/fhir/build/vscache/validation.cache/observation-codes.json'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options:
Last updated: Apr 12 2022 at 19:14 UTC
