Community
Participate
Working Groups
Could you provide a way to select changes to highlight from the compare view ? One for each incoming, outgoing and conflict changes. I need this because i have a branch which i rebase every weeks, and every times it's harder to find the changes from the HEAD and apply them.
This is similar to the request in bug 236439 which asks for a programatic way to hide outgoing changes.
Created attachment 119006 [details] Birds Eye view in compare editor The inability to hide outgoing changes is really a pain, especially when merging code that was branched a while ago. I have a file that contains a single conflict but there are many outgoing changes. You can see from the attached screen shot that the birds eye view in this case is useless since all the outgoing changes hide the single conflict. I am force to either navigate to each change until I find the conflict or scroll the window until I see it. If I could hide outgoing changes, finding the conflict would be easy.
I think hiding changes rather than highlighting them is a better option. Mainly because it would reduce the number of items on the ruler and make the compare editor less cluttered. What do you think? See bug 49915 for a similar discussion.
One more thing. By hiding I meant providing an outline with all the changes and buttons that lets you filter out changes of the type you're not interested in. Something similar to "Hide Non-Public Members" button in the Java Outline view. Any comments are welcome...
Toggle buttons sound good. They could look like attachment 129442 [details] (without "Incoming/Outgoing"), but with a diagonal line to signify "Hide", like e.g. the "Hide Local Types" button in the Java Outline.
Still working on the fix. I got some progress but it could be to late to release the change for 3.5. If that's the case we'll release it as early as possible in the 3.6 cycle.
(In reply to comment #6) > Still working on the fix. I got some progress but it could be to late to > release the change for 3.5. If that's the case we'll release it as early as > possible in the 3.6 cycle. I would say that it is too late to release this change. I would like to see it fixed at the beginning of 3.6.
*** Bug 82722 has been marked as a duplicate of this bug. ***
It's well past the beginning of 3.6. Is this still planned?
(In reply to comment #9) > It's well past the beginning of 3.6. Is this still planned? As of now it is. Not before M5 though.
This would still be quite interesting.
Removing the target and adding helpwanted.
*** Bug 331322 has been marked as a duplicate of this bug. ***
*** Bug 176220 has been marked as a duplicate of this bug. ***
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.
