Paul Burba wrote: [...] > we have only one XFailing test associated with an issue with the 1.8.0 > milestone (and it appears Julian is actively working on this, at least > it's assigned to him and marked as started): > > LISTING: merge_tests.py > Test # Mode Test Description > Issue#(Target Mileston/Assigned To) > ------ ----- ---------------- > 131 XFAIL merge binary file with keywords > #4221(1.8.0/julianfoad) > > Julian - What's the status on this? You still working on it? Is it > really a blocker for 1.8.0?
"Trivial merge of a binary file with svn:keywords raises a conflict" <http://subversion.tigris.org/issues/show_bug.cgi?id=4221> I am still working on it and think I will be fixing it soon. If I succeed, it won't be important to decide on the milestone. I'm not sure it really qualifies as a release blocker. Stefan, you asked the reporter to file it against 1.8.0; what do you think? - Julian
