After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 697562 - Easily separate conflicted from modified files in VC comparisons
Easily separate conflicted from modified files in VC comparisons
Status: RESOLVED OBSOLETE
Product: meld
Classification: Other
Component: general
unspecified
Other Linux
: Normal enhancement
: ---
Assigned To: meld-maint
meld-maint
Depends on:
Blocks:
 
 
Reported: 2013-04-08 14:47 UTC by team4
Modified: 2017-12-13 19:02 UTC
See Also:
GNOME target: ---
GNOME version: ---



Description team4 2013-04-08 14:47:57 UTC
We use meld to go through a list of CVS merge conflicts to resolve them.
However, it can be very difficult to see the "conflict" files in large projects as there are a large number of "modified" files.

It would be very nice if we could filter out the files by CVS status (the "Modified" filter shows both modified and conflicting), or to change the sort order to allow sorting by the Status column, or even adding Status to the type-ahead search.

Team4
Comment 1 Kai Willadsen 2013-04-17 19:38:56 UTC
Exposing all of the possible VC statuses as filters won't work; there's just too many of them. I can think of two possibilities: either add a "Conflict" filter (this would be redundant with modified, or we'd have to change the long-standing meaning of modified) or just provide the sorting that you mention. The sorting is only a partial solution, but it ameliorates the problem.
Comment 2 GNOME Infrastructure Team 2017-12-13 19:02:04 UTC
-- GitLab Migration Automatic Message --

This bug has been migrated to GNOME's GitLab instance and has been closed from further activity.

You can subscribe and participate further through the new bug through this link to our GitLab instance: https://gitlab.gnome.org/GNOME/meld/issues/50.