> On Dec. 26, 2015, 8:31 a.m., Aurora ReviewBot wrote: > > This patch does not apply cleanly against master (1ae77d5), do you need to > > rebase? > > > > I will refresh this build result if you post a review containing > > "@ReviewBot retry" > > Stephan Erb wrote: > The changes are already based on the recent master. Maybe this issue is > due to the `.gitattribute` changes? It was necessary to commit png's without > git messing up the line endings. > > Any idea?
`rbt` doesn't tend to fare well with binary patches. You're just seeing the bot react to `./rbt patch -c 41725` exiting non-zero: ```console $ ./rbt patch -c 41725 Patch is being applied from request 41725 with diff revision 3. error: missing binary patch data for 'docs/images/components.odg' error: binary patch does not apply to 'docs/images/components.odg' Falling back to three-way merge... error: missing binary patch data for 'docs/images/components.odg' error: binary patch does not apply to 'docs/images/components.odg' error: docs/images/components.odg: patch does not apply error: missing binary patch data for 'docs/images/components.png' error: binary patch does not apply to 'docs/images/components.png' Falling back to three-way merge... error: missing binary patch data for 'docs/images/components.png' error: binary patch does not apply to 'docs/images/components.png' error: docs/images/components.png: patch does not apply ERROR: Unable to apply the patch. The patch may be invalid, or there may be conflicts that could not be resolved. ``` Looks like the patch provided by ReviewBoard doesn't include anything for binary files. We haven't found a workaround for this, but also haven't spent much time trying to find one. - Bill ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/41725/#review111905 ----------------------------------------------------------- On Dec. 26, 2015, 11:53 a.m., Stephan Erb wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/41725/ > ----------------------------------------------------------- > > (Updated Dec. 26, 2015, 11:53 a.m.) > > > Review request for Aurora, Jay Buffington and Bill Farner. > > > Bugs: AURORA-852 > https://issues.apache.org/jira/browse/AURORA-852 > > > Repository: aurora > > > Description > ------- > > FMC Blockdiagram (http://www.fmc-modeling.org/) of Aurora components, showing > their communication paths and deployment. > > Given that this manual is targeting beginners, the diagram sacrifices > completeness in order to stay simple. > > > Diffs > ----- > > .gitattributes c41ea77f6e4f6b6a2e2d76f9bf96f1332dc7fe96 > docs/images/components.odg PRE-CREATION > docs/images/components.png PRE-CREATION > docs/installing.md 070bc82703b0823346286ef79838f08023facfd1 > > Diff: https://reviews.apache.org/r/41725/diff/ > > > Testing > ------- > > Rendered page is available at > https://github.com/StephanErb/aurora/blob/fmc/docs/installing.md > > > File Attachments > ---------------- > > Components > > https://reviews.apache.org/media/uploaded/files/2015/12/26/d1f51a1e-9125-40cf-a5a5-184c7aeacdcf__components.png > > > Thanks, > > Stephan Erb > >
