Closed elecnix closed 8 years ago
Quand je teste la patch, j’obtient:
iMac27-Ethernet:ErabliCollecteur pierre$ git apply --check 22.patch error: patch failed: app.js:112 error: app.js: patch does not apply
Comment m’y prendre pour appliquer la patch?
Pierre
Le 2 mars 2016 à 22:14, Nicolas Marchildon notifications@github.com a écrit : You can view, comment on, or merge this pull request online at: https://github.com/pleboeuf/ErabliCollecteur/pull/22 https://github.com/pleboeuf/ErabliCollecteur/pull/22 Commit Summary Fix format of published date when replaying. Log yellow warning when getting duplicate event that is not a replay. Replay: Send indexed generation & serial numbers, not raw data. Re-open particle stream on close. Fixes #9 File Changes M app.js https://github.com/pleboeuf/ErabliCollecteur/pull/22/files#diff-0 (42) M command.js https://github.com/pleboeuf/ErabliCollecteur/pull/22/files#diff-1 (7) M event.js https://github.com/pleboeuf/ErabliCollecteur/pull/22/files#diff-2 (7) Patch Links: https://github.com/pleboeuf/ErabliCollecteur/pull/22.patch https://github.com/pleboeuf/ErabliCollecteur/pull/22.patch https://github.com/pleboeuf/ErabliCollecteur/pull/22.diff https://github.com/pleboeuf/ErabliCollecteur/pull/22.diff — Reply to this email directly or view it on GitHub https://github.com/pleboeuf/ErabliCollecteur/pull/22.
Le 2 mars 2016 à 22:14, Nicolas Marchildon notifications@github.com a écrit :
You can view, comment on, or merge this pull request online at:
https://github.com/pleboeuf/ErabliCollecteur/pull/22 https://github.com/pleboeuf/ErabliCollecteur/pull/22 Commit Summary
Fix format of published date when replaying. Log yellow warning when getting duplicate event that is not a replay. Replay: Send indexed generation & serial numbers, not raw data. Re-open particle stream on close. Fixes #9 File Changes
M app.js https://github.com/pleboeuf/ErabliCollecteur/pull/22/files#diff-0 (42) M command.js https://github.com/pleboeuf/ErabliCollecteur/pull/22/files#diff-1 (7) M event.js https://github.com/pleboeuf/ErabliCollecteur/pull/22/files#diff-2 (7) Patch Links:
https://github.com/pleboeuf/ErabliCollecteur/pull/22.patch https://github.com/pleboeuf/ErabliCollecteur/pull/22.patch https://github.com/pleboeuf/ErabliCollecteur/pull/22.diff https://github.com/pleboeuf/ErabliCollecteur/pull/22.diff — Reply to this email directly or view it on GitHub https://github.com/pleboeuf/ErabliCollecteur/pull/22.
Ok, j'ai fait la patch manuellement, fusionné et poussé le tout sur github.
Voilà, j'ai fait le merge comme il faut, et ajouté: "Abort stream after one minute, or configured timeout."
Quand je teste la patch, j’obtient:
iMac27-Ethernet:ErabliCollecteur pierre$ git apply --check 22.patch error: patch failed: app.js:112 error: app.js: patch does not apply
Comment m’y prendre pour appliquer la patch?
Pierre