Sorry, I don't have my Apache Credentials handy to post this in JIRA, but the standard way I deal with this is to checkout the last version before the re-format. Apply the patch. Run the format tool, re-diff against the _re-formatted_ commit (otherwise you'll blow away any changes made to those areas), post the patch again.
It is a serious hassle, but it is generally easier and more accurate than resolving the conflicts by hand. The other choice is to just redo everything by hand using the patch as a guide. I've never bothered to put together a toolchain to do this, but it shouldn't be that difficult assuming the re-formatter can be run from the command line. Kirby On Thu, Oct 27, 2011 at 3:16 AM, Lewis John McGibbney (Commented) (JIRA) <[email protected]> wrote: > > [ > https://issues.apache.org/jira/browse/NUTCH-865?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13136889#comment-13136889 > ] > > Lewis John McGibbney commented on NUTCH-865: > -------------------------------------------- > > Markus (or anyone else), the more I think about this, the more I have > convinced myself that the patches will undoubtably have adverse affects on > your (and everyone elses) existing patches. There are in some cases > additional lines added and in other cases there are lines removed due to > formatting. I would be extremely surpised if hunks were to find a place in > every case. Although I cannot confirm this, I think it is safe to hope for > the best but prepare for the worst. Where does this leave us with this > issue??? > >> Format source code in unique style >> ---------------------------------- >> >> Key: NUTCH-865 >> URL: https://issues.apache.org/jira/browse/NUTCH-865 >> Project: Nutch >> Issue Type: Improvement >> Reporter: Pham Tuan Minh >> Assignee: Lewis John McGibbney >> Fix For: 1.4 >> >> Attachments: NUTCH-865-nutchgora-rev1188268.patch, >> NUTCH-865-trunk-rev1188252.patch, NUTCH-865.patch >> >> >> We should define a standard format rules for source code/comments, then >> using eclipse tool to format the whole source code in the same style. > > -- > 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 > > >
