[
https://issues.apache.org/jira/browse/KAFKA-348?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Joe Stein updated KAFKA-348:
----------------------------
Attachment: kafka348.patch.2.txt
kafka328.notes.2.txt
ok, I started again from scratch and took detailed notes for all conflicts from
the merge and what how it was resolved.
Attached are
1) my notes for all the conflicts encountered
2) the latest patch. Please note I figured out why the "added" files to trunk
are not showing up in the diff from the merge. the reason is because these
files are actually not new but actually a direct descendant of a real file in
the repo. supposedly a new version of SVN client has a new flag called
--show-copies-as-adds so that these files will show up in the diff. I will
update a machine for the latest client version of SVN and make a new patch so
it is holy complete before commit
I did want to post everything for where it is now because:
1) there is one last error
[info] Compiling main sources...
[error]
/Users/josephstein/rebase_kafka/rebase_0.8/core/src/main/scala/kafka/server/KafkaApis.scala:100:
type mismatch;
[error] found : kafka.message.MessageSet
[error] required: kafka.message.ByteBufferMessageSet
[error] log.append(partitionData.messages)
[error] ^
[error] one error found
this is a result of KAFKA-310 on the trunk changing the append function in
Log.scala
https://github.com/apache/kafka/commit/2bcc91134316a546322bf59a422bec1934613607
and the use of that function in KAFKA-49
https://github.com/apache/kafka/commit/1461a3877f34db9ac5ce1f809d53bc353df24b01
any thoughts?
2) review of everything going in
I will work on updating svn so i can produce a patch with the merged copies
that are from trunk as new to this branch and also mull on this error maybe
someone knows a fix here?
> rebase 0.8 branch from trunk
> ----------------------------
>
> Key: KAFKA-348
> URL: https://issues.apache.org/jira/browse/KAFKA-348
> Project: Kafka
> Issue Type: Task
> Affects Versions: 0.8
> Reporter: Joe Stein
> Priority: Critical
> Attachments: kafka328.notes.2.txt, kafka348.patch.1.txt,
> kafka348.patch.2.txt
>
>
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators:
https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira
