Community
Participate
Working Groups
3.6 M6. I often have the case where applying a patch results in conflicts because I already made some changes in my workspace. In this case I hope that pressing 'Guess' helps but it does not. Most of the time the guessed fuzz factor is much too low and when I then enter e.g. 100 manually, it just works fine. We should improve the logic here.
A modified file and a patch for it that cannot be applied even when "Guess" is used, would be a good starter.
It happens quite often to me, even without the file being modified at all. Here's one example:1 1. check out 'org.eclipse.releng.tools' from HEAD as of today 2. paste the patch from attachment 89116 [details] into the Package Explorer ==> all files have conflicts 3. press 'Guess' ==> fuzz factor set to 1, only one file has no conflict 4. enter 100 as fuzz factor ==> now only 3 files remain with conflicts (much better)
Well, this is most probably because setting the factor to a value greater then number of context lines used in the patch results in completely ignoring the context. So in this case I assume setting the fuzz to 3 would give the same effect. Guessing does not allow to ignore all context line as described in bug 223317, comment 3. It doesn't mean we cannot change the way it works, but I'd rather inform the user about the fact.
All I'm saying that normally when I enter a high number it just works i.e. I don't see/get any negative side effects and actually that's what I would expect out of the box.
This bug hasn't had any activity in quite some time. Maybe the problem got resolved, was a duplicate of something else, or became less pressing for some reason - or maybe it's still relevant but just hasn't been looked at yet. If you have further information on the current state of the bug, please add it. The information can be, for example, that the problem still occurs, that you still want the feature, that more information is needed, or that the bug is (for whatever reason) no longer relevant.
