search

dajobe / raptor

Redland Raptor RDF syntax library
https://librdf.org/raptor/
Other
157 stars 62 forks source link

Mkr serializer #22

Closed rhmccullough closed 9 years ago

rhmccullough commented 9 years ago

The only conflict is in raptor_serialize_turtle.c. You edited some code which I deleted. By using SPARQL CSV format, I don't need format & meaning variables.

rhmccullough commented 9 years ago

I merged and deleted the conflict in raptor_serialize_turtle.c. No warning flags from raptor_serialize_turtle.c. All tests pass. I pushed to mkr-serializer.

dajobe commented 9 years ago

Github says this can't be merged. Can you merge or rebase to origin/master ?

Also, please add a description in the PR of the purpose of this patch.

rhmccullough commented 9 years ago

I keep forgetting that I have to give multiple lines to git for it to pass on the info. to the pull request. I will merge to my origin master.

rhmccullough commented 9 years ago

I'm getting confused. Do I have to create a new pull request from my origin master?

rhmccullough commented 9 years ago

GitHub is still calling this a conflict because the conflict resolution involves deleting code which you modified. The replacement code is in raptor_mkr_emit_subject_resultset(), lines 727 - 735 in my origin master. As I recall, you put in a couple of casts to get rid of warning messages, but that was code for "format" and "meaning" variables, which I have deleted. I am going to close this PR and open a new one with my origin master. If GitHub doesn't pass thru my reason for the change, I will repeat it.