Patching, the conclusion of the saga: There are many SVN tool variations that create patches on Windows. However, they all use a variety of 3-way merge tools in order to do it. Options include the built-in SVN differ, KDiff3, TortoiseMerge, diff3 in unixtools, etc. What all these tools have in common is that they don't allow 3-way diffing that ignores EOL let alone white space.
I could kludge my tool sets to put in a 2-way differ for the moments I create patches, and then switch back for the other type of merging. However, the tools that apply patches (and the comparison tools) all allow ignoring whitespace. I'm going to leave it to patch appliers to test apply the patch as the best way to get around the conundrum when it's a big patch. Also, I can generally switch all files to CR/LF on opening, and that should help as well. Thanks for the many suggestions! -Lukas Lukas Oberhuber -----Original Message----- From: Jérôme WAGNER [mailto:[EMAIL PROTECTED] Sent: 21 October 2006 13:02 To: 'Lukas Oberhuber' Cc: [email protected] Subject: RE: patch, indenting and diffing Hello Likas, Have you tried KDiff3 ? they now have a port for windows that seems to work Jérôme -----Message d'origine----- De : Lukas Oberhuber [mailto:[EMAIL PROTECTED] Envoyé : vendredi 20 octobre 2006 14:16 À : 'Jérôme WAGNER' Objet : RE: patch, indenting and diffing Jerome, Looks like it doesn't support 3-way merge, so also not a good substitute. :( -Lukas Lukas Oberhuber -----Original Message----- From: Jérôme WAGNER [mailto:[EMAIL PROTECTED] Sent: 20 October 2006 08:36 To: 'Lukas Oberhuber' Cc: [email protected] Subject: patch, indenting and diffing Hello Lukas, Currently the default-attractor indentation in phapi should be a tab. There are still files that are not respecting that convention that can lead to weird diffing. On windows, I usually use winmerge where you can ask it to diff files, or directories and try to do its best to avoid indenting problems. Jérôme -----Message d'origine----- De : Lukas Oberhuber [mailto:[EMAIL PROTECTED] Envoyé : jeudi 19 octobre 2006 16:18 À : 'Vadim Lebedev'; 'Jérôme WAGNER' Cc : [email protected] Objet : RE: [Wengophone-devel] branches and wifo-refactoring Vadim, I've searched high and low on windows for a command line differ that will ignore whitespace or even just EOL, so that I can call it from tortoisesvn or subclipse. No luck. I've given up. Looks like you will have to apply the patch, and then in your compare viewer turn off whitespace. Sorry about that. -Lukas Lukas Oberhuber -----Original Message----- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Lukas Oberhuber Sent: 19 October 2006 14:09 To: 'Vadim Lebedev'; 'Jérôme WAGNER' Cc: [email protected] Subject: RE: [Wengophone-devel] branches and wifo-refactoring All, For reasons I'm not clear on, eclipse's version of patch creation is quite crap, which led to this patch. I looked at all the modifications in the comparison viewer and did not realize this was the result I would get. I think it is due to not ignoring whitespace and the difference between windows and unix end of line characters. >Regarding this patch: >1) It seems that: lines 1670-1676 in udp.c are not necesaary beacuse >of lines: 1634-1638 I think you are right. It would want some testing of course. >2) I suspect that removal of: > snprintf(je->req_uri, 255, "%s", tmp); > osip_free(tmp); > in couple of places in jevent.c is wrong.... I think this is an artifact of the diffing algorithm. They are not actually removed. I will try to create a better patch, but not sure I can because of eclipse. >3) Is it so difficult to keep same indentation style as the rest of >file? It simplifies maintenance The indentation style for this code that I see in my editors is *very* erratic. I have my editor set to use tabs of size 2. This appears to be correct in most of the wengophone code, but in the osip libraries the code looks randomly indented (on my system). In order to make changes, I had to do some organizing. Let me know what the correct setting are, but it is tricky to maintain different ones for different files. Thanks for the comments Vadim. -Lukas Lukas Oberhuber -----Original Message----- From: Vadim Lebedev [mailto:[EMAIL PROTECTED] Sent: 19 October 2006 12:35 To: Jérôme WAGNER Cc: 'Lukas Oberhuber'; [email protected] Subject: Re: [Wengophone-devel] branches and wifo-refactoring Jérôme WAGNER wrote: >Hello Lukas, > >Thank you very much for this patch. > >I created ticket #1075 to hold it and this ticket will be used for the >review. > >http://dev.openwengo.com/trac/openwengo/trac.cgi/ticket/1075 > > > Regarding this patch: 1) It seems that: lines 1670-1676 in udp.c are not necesaary beacuse of lines: 1634-1638 2) I suspect that removal of: snprintf(je->req_uri, 255, "%s", tmp); osip_free(tmp); in couple of places in jevent.c is wrong.... 3) Is it so difficult to keep same indentation style as the rest of file? It simplifies maintenance Thanks Vadim _______________________________________________ Wengophone-devel mailing list [email protected] http://dev.openwengo.com/mailman/listinfo/wengophone-devel _______________________________________________ Wengophone-devel mailing list [email protected] http://dev.openwengo.com/mailman/listinfo/wengophone-devel
