Re: What's cooking in git.git (Aug 2010, #02; Wed, 11)
Johannes Sixt <j.sixt@viscovery.net> writes:
> I compiled many topics in pu and ran the test suite on Windows,
> particularly those that "look good" and "will merge to next". Here's a report.
Show 10 quoted lines
>> * jn/apply-filename-with-sp (2010-07-23) 4 commits
>> - apply: Handle traditional patches with space in filename
>> - t4135 (apply): use expand instead of pr for portability
>> - tests: Test how well "git apply" copes with weird filenames
>> - apply: Split quoted filename handling into new function
>>
>> Looked Ok. Will merge to 'next'.
>
> The test cases that work with files with tabs must have a prerequisite;
> see t3600-rm.sh.
Show 12 quoted lines
>> * en/d-f-conflict-fix (2010-07-27) 7 commits
>> (merged to 'next' on 2010-08-03 at 7f78604)
>> + t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
>> + fast-import: Improve robustness when D->F changes provided in wrong order
>> + fast-export: Fix output order of D/F changes
>> + merge_recursive: Fix renames across paths below D/F conflicts
>> + merge-recursive: Fix D/F conflicts
>> + Add a rename + D/F conflict testcase
>> + Add additional testcases for D/F conflicts
>
> The new tests in t/t3509-cherry-pick-merge-df.sh and t9350-fast-export.sh
> need SYMLINKS prerequisite.
Again, thanks for stopping me.
Junio C Hamano <gitster@pobox.com>