Re: cvs: phd /themes/php phpdotnet.php
| From: | Hannes Magnusson | Date: | Sat, 15 Nov 2008 17:55:34 +0000 |
| Subject: | Re: cvs: phd /themes/php phpdotnet.php | ||
| References: | 1 2 | Groups: | php.doc.cvs |
| Request: | Send a blank email to doc-cvs+get-2559@lists.php.net to get a copy of this message | ||
On Fri, Nov 7, 2008 at 22:59, Christian Weiske <cweiske@cweiske.de> wrote:
> Hi all,
>
>
>
>> Modified files:
>> /phd/themes/php phpdotnet.php
>> Log:
>> Merge loudis change from 0_4 back to head
>
> Something went wrong here with my diff/merge tool. I only merged some
> lines, not the whole file.
I am pretty sure he committed only to HEAD, and then merged it to 0.4
when I asked him to do it.
This commit however replaced the newlines of the entire file, WTF?
Please fix your editor to not mess with any whitespaces at all, its
ridiculously annoying to read the diffs and makes it almost impossible
to track down changes in history - not to mention causing more work
when merging patches between branches.
-Hannes