On Tue, 2003-04-15 at 14:55, Dimitrie O. Paun wrote:
Jer,
When you apply my patches, please try to no change the whitespace, as it creates conflicts on my side, and I can't tell if you've changed anything.
I think you applied my patches from Windows, and the line endings changed, or something like that.
Please don't accuse me of using Windows. I would never do such a thing. ;) The problem comes from copy/paste the patch from my email prog (Evolution) to my text editor (Anjuta). I my web code, I prefer to use 4 spaces for indenting, no tab characters please. Don't give me the spaces take more time to transfer over http crap, our web server uses gzip encoding. <g>
The patch was rejected by the patch command, so I had to manually line by line apply it (ish).
In the future, attachments will be preferred for patches. I may just decide to not apply them otherwise.
On 15 Apr 2003, Jeremy Newman wrote:
Please don't accuse me of using Windows. I would never do such a thing. ;) The problem comes from copy/paste the patch from my email prog (Evolution) to my text editor (Anjuta). I my web code, I prefer to use 4 spaces for indenting, no tab characters please. Don't give me the spaces take more time to transfer over http crap, our web server uses gzip encoding. <g>
Oh come on, please don't accuse me of even thinging about such crap! :) Sorry, I don't care what I use -- tabs, spaces, all that matters to me is for the thing to line up. Since those pages are maintained at my site, it is important to keep them in synch, otherwise I'll not be able to provide good updates.
The patch was rejected by the patch command, so I had to manually line by line apply it (ish).
Ouch. Don't do that -- just reject it if it doesn't apply, I'll send it again, no problem.
In the future, attachments will be preferred for patches. I may just decide to not apply them otherwise.
Sure, if you so prefer. But the problem is that you used copy & paste. Just pipe the email body to patch, that'll do the job.
On Wed, 2003-04-16 at 00:12, Dimitrie O. Paun wrote:
In the future, attachments will be preferred for patches. I may just decide to not apply them otherwise.
Sure, if you so prefer. But the problem is that you used copy & paste. Just pipe the email body to patch, that'll do the job.
I copied it from the email prog into my text editor then saved it. Then used the 'patch -p0 < foo.patch' command. Excuse my patching inexperience here. ;) Also recommended to me was just to "save as" the entire message.
I'll get your patches in sometime today, I'm a little buried right now, our office building lost power for a couple hours so I'm in the process of getting our network back up and stable. The co-lo server where WineHQ is hosted was unaffected thankfully.
On 16 Apr 2003, Jeremy Newman wrote:
I copied it from the email prog into my text editor then saved it. Then used the 'patch -p0 < foo.patch' command. Excuse my patching inexperience here. ;) Also recommended to me was just to "save as" the entire message.
Yeah, the copy & paste must have done it. Well, ask Alexandre, I suspect he knows a thing or two about it :) BTW, I'm surprised that the mailers (KMail, Evolution) don't have a built it action like pressing 'P' while viewing a email to apply the patch (I haven't checked closely, but I've never seen something like this).
I'll get your patches in sometime today, I'm a little buried right now, our office building lost power for a couple hours so I'm in the process of getting our network back up and stable. The co-lo server where WineHQ is hosted was unaffected thankfully.
I hope you guys have good a UPS. My server has an uptime >300 days, and I had many power failures (some quite long). It saves the day.
BTW, I'm surprised that the mailers (KMail, Evolution) don't have a built it action like pressing 'P' while viewing a email to apply the patch.
You could make them do it automatically - unless am option hidden way down a system menu (at the bottom of a broken flight of stairs in a celler where the light doesn't work) has been turned off :-) - ooops wrong OS :-)
David
-
David Laight -
Dimitrie O. Paun -
Jeremy Newman