[ https://issues.apache.org/jira/browse/FLUME-1770?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13537172#comment-13537172 ]
Brock Noland edited comment on FLUME-1770 at 12/20/12 5:21 PM: --------------------------------------------------------------- What I would do is do the work on a seperate branch so: {noformat} git checkout trunk git checkout -b FLUME-1770 # do work git commit -m "" git diff trunk > FLUME-1770-0.patch {noformat} {noformat} # then assume there is a revsion git checkout FLUME-1770 git fetch origin git merge trunk # do work git commit -m "" git diff trunk > FLUME-1770-0.patch {noformat} so in your case, I am not sure if you have a local branch or not? but what you could do, assuming a clean trunk is: {noformat} git checkout trunk git fetch origin git merge origin/trunk git checkout -b FLUME-1770 patch -p0 < FLUME-1770.patch (normally you'd use git apply here but the patch doesn't work with it) # fix any problems git commit -m "" git diff trunk > FLUME-1770-1.patch {noformat} was (Author: brocknoland): What I would do is do the work on a seperate branch so: git checkout trunk git checkout -b FLUME-1770 # do work git commit -m "" git diff trunk > FLUME-1770-0.patch # then assume there is a revsion git checkout FLUME-1770 git fetch origin git merge trunk # do work git commit -m "" git diff trunk > FLUME-1770-0.patch so in your case, I am not sure if you have a local branch or not? but what you could do, assuming a clean trunk is: git checkout trunk git fetch origin git merge origin/trunk git checkout -b FLUME-1770 patch -p0 < FLUME-1770.patch (normally you'd use git apply here but the patch doesn't work with it) # fix any problems git commit -m "" git diff trunk > FLUME-1770-1.patch > Flume should have serializer which supports serializer the headers to a > simple string > ------------------------------------------------------------------------------------- > > Key: FLUME-1770 > URL: https://issues.apache.org/jira/browse/FLUME-1770 > Project: Flume > Issue Type: Improvement > Affects Versions: v1.3.0 > Reporter: Brock Noland > Priority: Minor > Labels: serializers > Attachments: FLUME-1770.patch > > > BodyTextserializer ignores the headers where as AvroEventserializer writes > out an Avro file. It would be nice if we had a simple one which write out the > headers prefixed the line of text. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira