Comment 22 for bug 405317

> Were you using filters before you upgraded?
No; 1.16 was the 1st version where content filtering was usable. We have now enabled it to handle line endings more properly.

Would it be helpful if I disabled content filtering on my machine for a while?

> Tell me, do you have a pattern where you repeatedly merge from some branch B, but never merge back into that branch?
Yes, totally. As I told above the 5 branches represent different versions. When I fix something in the lowest version it gets merged "upwards" to the newer versions and finally to the trunk branch. Of course we NEVER merge a "higher version" branch to a "lower version" branch for that would make the versions the same - it would merge back all new development done for the higher version. Most of the trouble you see here is from that trunk branch which collected /all/ fixes on /all/ versions below it. This I think also explains the large #of revisions; a single fix merge here contains all of the commit/merge revisions of all lower branches below it.

The part about heads and having to re-check whether (files?) in the other branch had changed is way over my head; I would need to learn your terminology 1st. I am surprised a bit, because I expected merge to only work with the difference in revisions between the two trees, and then only on the files that have changed in those revisions on both sides.

Thanks again for your time and have a good weekend!