Menu
▾
▴
Re: [pupnp-devel] [PATCH]parser_parse_headers: robustness improvement
|
From: Peng <how...@gm...> - 2013-09-03 12:52:25
|
Marcelo, thank you for the quick replay. My develop environment is Ubuntu 13.04+Eclipse CDT+EGIT. As you suggested, I checked the pupnp.patch, which is generated by EGIT and found no "\r\n", which (if any) should be visible in my editor (I set it to be so). However, there is indeed difference between the one I sent and the one generated by git format-patch, i.e. the latter always contains an empty line. Don't know whether it is related to the problem. Two new patches generated by 'git format-patch' are attached. Please kindly let me know if anything wrong. Regards, Peng On 09/03/2013 07:54 PM, Marcelo Roberto Jimenez wrote: > Hi Peng, > > I always apply patches on top of 1.6.x, unless explicitly told not to > do that. If you are not doing development on top of master, please > keep patching on top of 1.6.x, which is currently the stable release. > I usually take care to forward port everything to master. > > I believe the problem has to do with the newline format of the files > you are sending, I always have to do "dos2unix" first on your files. > Are you using windows or linux? Anyway, the problem should go away if > you generate the files with "git format-patch". > > Regards, > Marcelo. > > > On Tue, Sep 3, 2013 at 5:26 AM, Peng <how...@gm... > <mailto:how...@gm...>> wrote: > > Hi Marcelo, > > the patches were based on branch 1.6.x, not the master. Maybe it > caused the problem. > > Next time I will commit changes to a git clone of the master > branch, and make pull request, which will ease the process of > review and merge. I will also take care of the ChangeLog file. > > Peng > > > > > ------------------------------------------------------------------------------ > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! > Discover the easy way to master current and previous Microsoft technologies > and advance your career. Get an incredible 1,500+ hours of step-by-step > tutorial videos with LearnDevNow. Subscribe today and save! > http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk > > > _______________________________________________ > pupnp-devel mailing list > pup...@li... > https://lists.sourceforge.net/lists/listinfo/pupnp-devel |