On Mon, 24 Sep 2012 00:05:40 +0200 Tom Hacohen <t...@stosb.com> said:
> On 23/09/12 23:14, Lucas De Marchi wrote: > > It sounds like an excuse to not do the right thing. The manual > > intervention should be very minimal and it shouldn't be a source of > > bugs... once it compiles, it should work as if the paths haven't > > changed. > > It's easier to mis-merge, and that's a source of bugs. Everything that > is not completely automatic is a potential source of bugs. The word > "should" is responsible for 87% of all software bugs, so I don't really > trust that. > > With that being said, I do trust you, and you said that svn-git-am can > handle it gracefully, lets just hope it does. > > I'm fine with waiting with applying the patches, but lets have a > schedule for that. > > What's the plan for this merge? When will I be able to merge stuff? And > btw, do we make sure history is correctly kept for source files? Cause > that can be crazily annoying. i've been thinking about this. here is my take: eo should merge into the efl tree. this means it first needs to go into existing efl trees. so for evas that means - put it in. for stuff beyond evas unless u are fast u may have to port your changes to the new efl tree no matter what. at LEAST this is easy if u take your patches and split them up PER file and then apply those diffs per file - u wont get any mismerge problems u wouldn't get anyway as a result of doing work offline for a long time. :) -- ------------- Codito, ergo sum - "I code, therefore I am" -------------- The Rasterman (Carsten Haitzler) ras...@rasterman.com ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://ad.doubleclick.net/clk;258768047;13503038;j? http://info.appdynamics.com/FreeJavaPerformanceDownload.html _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
