Community
Participate
Working Groups
I went ahead and tried to search for a similar bug before opening this one, so forgive me if it is a duplicate. I am working with someone on some new functionality. My co-worker is sending me a patch for his work to review. After I reviewed it, there were a few minor changes to be made. Upon receiving the second patch, I had no good way to compare what changes he made relative to his first patch. It would be amazing if I could some how compare what is currently in my workspace to what I would see when I applied the patch to the code currently in CVS. If there were conflicts with the patch application, I would accept the compare failing. I would also imagine this would not be a very quick process and have little expectation on lightening quick performance. I am not familiar with the compare framework but imagine this could be a very tall order. Figured I would just throw it out there to get people's opinions.
Actually, I don't know if it would be that difficult in the case where you had the common base in your workspace and both patches applied cleanly. In that scenario, it should be possible to compare the two patches. We'll think about it for 3.4 but I can't guarantee we'll get to it.
This would be very helpful.
Dani, Brain what would you say if I created a content viewer dedicated for patches? I can think of couple enhancements that could be added to such viewer, like patch structure compare. The viewer could also come in handy for Markus (see bug 210627). I know that this would only a palliative, but I thought it's worth asking. What do you think?
I don't think I understand what you mean by "a content viewer dedicated for patches". What would the content viewer show? Just add syntax coloring to a patch file? Or would it be used in a content merge viewer to show a before-after comparison, based on the contents of the revision the patch is based on? I guess structure compare on two patches alone (without the base revision) would not be very interesting, because it could not show the diffs in context.
>I don't think I understand what you mean by "a content viewer dedicated for >patches".Same here. What I would like to see is the compare editor used in the Synchronize view and be able to move stuff from the patch side to the workspace: the left side would contain my current workspace file and the right side would contain the revision from CVS as indicated in the patch + the patch being applied. [current workspace file] [file rev. xyz with patched applied] For three-way compare the anchestor would be the file with the revision from the patch (unpatched).
(In reply to comment #5) +1. Very good proposal. That would be a productivity booster for committers who have to go through several iterations until a contribution is good enough to be released (the 90% case).
I like this enhancement. +1 for Dani's idea. However I have to postpone it to 3.5 to better match the reality.
We haven't investigated the issue during 3.5 and we don't plan to address it now. I'm removing the target milestone but we'll set more realistic one when we have feedback from anyone interested in fixing this. We're considering it for 3.6.
> [..] when we have feedback from anyone interested in fixing this. I'm primarily interested in having it fixed ;-). > We're considering it for 3.6. That's great!
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.
