> On May 17, 2012, 12:39 a.m., Andreas Hansson wrote: > > This patch does not apply cleanly. > > Hamid Reza Khaleghzadeh wrote: > Could you tell me what is wrong? > > Thanks > > Hamid Reza Khaleghzadeh wrote: > Hello, > > Excuse me, I'm again. I have created diff file again. But I think the > problem still exists (I found this from View Diff). Perhaps the way which > diff file created is wrong. In my approach, main GEM5 source code exists in > folder "a" and modified one is in folder "b". I create diff file as following: > "diff -ru a/ b/ > modify.patch" > Could you tell me what is wrong? > By the way, the patch is applied to folder "a". I found that patch is > correct. > > Thanks > > Hamid Reza Khaleghzadeh wrote: > Please someone helps me.
I think the easiest and most error-proof way of doing this is with mercurial queues. There are ample tutorials online, and with mercurial generating the patch for you there should be no risk of having a patch that does not apply cleanly (assuming your tree is up to date) - Andreas ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: http://reviews.gem5.org/r/1202/#review2699 ----------------------------------------------------------- On May 17, 2012, 1:33 a.m., Hamid Reza Khaleghzadeh wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > http://reviews.gem5.org/r/1202/ > ----------------------------------------------------------- > > (Updated May 17, 2012, 1:33 a.m.) > > > Review request for Default. > > > Description > ------- > > Hello Mr./Mrs. reviewer, > > This patch modifies GEM5 source code so that ruby stats is reset/dumped when > gem5 stats is being reset/dumped. > > Hope this is useful > > > Diffs > ----- > > b/src/base/output.cc a/src/base/output.cc > b/src/base/statistics.hh a/src/base/statistics.hh > b/src/base/statistics.cc a/src/base/statistics.cc > b/src/base/stats/text.cc a/src/base/stats/text.cc > b/src/mem/ruby/profiler/Profiler.cc a/src/mem/ruby/profiler/Profiler.cc > b/src/mem/ruby/system/System.hh a/src/mem/ruby/system/System.hh > b/src/mem/ruby/system/System.cc a/src/mem/ruby/system/System.cc > > Diff: http://reviews.gem5.org/r/1202/diff/ > > > Testing > ------- > > > Thanks, > > Hamid Reza Khaleghzadeh > > _______________________________________________ gem5-dev mailing list [email protected] http://m5sim.org/mailman/listinfo/gem5-dev
