On Friday, 30 June 2006 17:16, D. Michael 'Silvan' McIntyre wrote: > On Thursday 29 June 2006 7:02 am, Martin Shepherd wrote: > > The following patch was the output of 'svn diff gui', after I updated > > my copy of the rosegarden code with the trunk, and resolved the one > > resulting conflict. Note that along with changes to existing files, > > this patch also includes two new files, which would need to be 'svn > > add'ed, if you wanted to commit the patch somewhere. The two new files > > are called rosegardenparameterarea.h and rosegardenparameterarea.cpp. > > Looks and sounds great, but most of the hunks fail to apply to my 7323 > tree. I don't see why that should be the case. I haven't changed anything > that should conflict here. > > I'm probably just a dumbass.
It fails here too. Martin: Can you send your patch again, this time as an attachement, please? Example of my results: $ patch -p0 < ~/Documents/rosegarden/Martin_Shepherd_New_Parameter_Area.patch patching file rosegardenconfiguredialog.h Hunk #1 FAILED at 66. 1 out of 1 hunk FAILED -- saving rejects to file rosegardenconfiguredialog.h.rej patching file rosegardenconfiguredialog.cpp Hunk #1 FAILED at 168. 1 out of 1 hunk FAILED -- saving rejects to file rosegardenconfiguredialog.cpp.rej patching file rosegardenconfigurationpage.h Hunk #1 FAILED at 188. Hunk #2 FAILED at 209. 2 out of 2 hunks FAILED -- saving rejects to file rosegardenconfigurationpage.h.rej patching file widgets.h Hunk #1 FAILED at 111. 1 out of 1 hunk FAILED -- saving rejects to file widgets.h.rej patching file SConscript Hunk #1 FAILED at 110. 1 out of 1 hunk FAILED -- saving rejects to file SConscript.rej patching file rosegardengui.h Hunk #1 FAILED at 32. Hunk #2 FAILED at 1305. Hunk #3 FAILED at 1559. 3 out of 3 hunks FAILED -- saving rejects to file rosegardengui.h.rej patching file segmentparameterbox.cpp Hunk #1 FAILED at 44. Hunk #2 FAILED at 76. Hunk #3 FAILED at 88. Hunk #4 FAILED at 193. Hunk #5 FAILED at 220. 5 out of 5 hunks FAILED -- saving rejects to file segmentparameterbox.cpp.rej patching file instrumentparameterbox.cpp Hunk #1 FAILED at 68. Hunk #2 FAILED at 132. Hunk #3 FAILED at 657. Hunk #4 FAILED at 690. 4 out of 4 hunks FAILED -- saving rejects to file instrumentparameterbox.cpp.rej patching file rosegardenparameterarea.h patching file rosegardenconfigurationpage.cpp Hunk #1 FAILED at 92. Hunk #2 FAILED at 157. Hunk #3 FAILED at 171. Hunk #4 FAILED at 199. Hunk #5 FAILED at 326. 5 out of 5 hunks FAILED -- saving rejects to file rosegardenconfigurationpage.cpp.rej patching file rosegardenparameterarea.cpp patching file widgets.cpp Hunk #1 FAILED at 100. Hunk #2 FAILED at 126. 2 out of 2 hunks FAILED -- saving rejects to file widgets.cpp.rej patching file rosegardengui.cpp Hunk #1 FAILED at 29. Hunk #2 FAILED at 261. Hunk #3 FAILED at 353. Hunk #4 FAILED at 5387. Hunk #5 FAILED at 7500. 5 out of 5 hunks FAILED -- saving rejects to file rosegardengui.cpp.rej Regards, Pedro Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Rosegarden-devel mailing list Rosegarden-devel@lists.sourceforge.net - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
