On 19-Dec-2012, at 8:36 AM, David Nalley <[email protected]> wrote: > On Tue, Dec 18, 2012 at 10:59 PM, Rohit Yadav <[email protected]> wrote: >> >> ----------------------------------------------------------- >> This is an automatically generated e-mail. To reply, visit: >> https://reviews.apache.org/r/8545/#review14711 >> ----------------------------------------------------------- >> >> >> Thanks for your patch, but your changes are not applying cleanly and will >> break both api_refactoring and javelin. I will have to merge the >> api_refactoring branch soon else there will be pile of review with a lot of >> merge conflicts. >> >> My target was to merge api_refactoring yesterday but I thought I would fix >> some more stuff before I merge it on master
See below: >> so it won't break anything on master. >> If you already working on some other unit tests pl. work on the >> api_refactoring branch, I'm planning to send a merge request and progress >> report on dev ML this weekend. >> >> - Rohit Yadav >> > > Please discuss this on list before you attempt a merge. Yes, as I mentioned I'll send a merge request before doing it i.e. ask community to checkout the code comment on merge etc. Meanwhile, any patch related to api layer, anything like unit tests etc. should be done on api_refactoring to avoid merge conflicts without waiting for the actual merge on master. > Something of > this magnitude should not happen without some degree of notice. I understand your concern but I think it won't be any major issue as the merge conflicts on master (as of now) are about 100-200 and the only significant changes are package renames, and annotations. Regards. > > --David
