Github user mbalassi commented on the pull request:
https://github.com/apache/flink/pull/326#issuecomment-70743431
Woot! :)
As for merging the streaming back then, it was @StephanEwen who came up
with the solution, pasting the important parts here:
"
BTW: I used this way to do it:
Have two repositories (clones)
- /data/repositories/flink
- /data/repositories/flinkbak
The do the following for every non-merge commit:
- Check out the state after a commit in the backup (detached head)
- Remove current streaming directory (physically and from the index)
- Add it again (files and index), with the state of the cloned repo
- Commit (git recreates the diffs in a way that they reflect the original
commit plus any merges)
---------------------
#!/bin/bash
for line in $(cat commits)
do
cd /data/repositories/flinkbak
author=`git --no-pager show -s --format='%an <%ae>' $line`
message=`git --no-pager show -s --format='%s%n' $line`
echo "picking commit $line from author $author"
git checkout $line
cd /data/repositories/flink
rm -rf "/data/repositories/flink/flink-addons/flink-streaming"
git rm -r "/data/repositories/flink/flink-addons/flink-streaming"
cp -r "/data/repositories/flinkbak/flink-addons/flink-streaming"
"/data/repositories/flink/flink-addons/flink-streaming"
git add /data/repositories/flink/flink-addons/flink-streaming
git commit --author "$author" --m "$message"
# read -rsp $'Press any key to continue...\n' -n1 key
done
"
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
