22 Jun
2011
22 Jun
'11
3:05 p.m.
Hi. Here I'll list changesets that cause conflicts and ask what to do. 1. http://tinyurl.com/63tey39 vs. http://tinyurl.com/5v2pluf it's a fix for bug#49322. both changes are similar, return is moved down. But Igor put it after the while() loop, while Ole John - in the loop, as soon a non-match is found. What difference does it make, I mean the earlier return, what consequences? 2. http://tinyurl.com/69lwrp9 - a big chunk is moved around in test_if_skip_sort_order() that's all, the rest of the file I've merged already. Regards, Sergei