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 150178 - file/dir + patch mode
file/dir + patch mode
Status: RESOLVED OBSOLETE
Product: meld
Classification: Other
Component: general
unspecified
Other Linux
: Normal enhancement
: ---
Assigned To: Stephen Kennedy
Stephen Kennedy
: 150063 150065 166351 (view as bug list)
Depends on:
Blocks:
 
 
Reported: 2004-08-15 13:47 UTC by Aidas Kasparas
Modified: 2017-12-13 18:44 UTC
See Also:
GNOME target: ---
GNOME version: ---



Description Aidas Kasparas 2004-08-15 13:47:50 UTC
How about mode, where file or directory + patch-file (which potentially produce
 .rej files if run via patch command) is opened. I would like meld to apply
changes for cleanly applicapable chunks and let me sort out [parts of] chunks,
which would be rejected.

I'm not sure how related this is to #150065.
Comment 1 Stephen Kennedy 2004-08-16 09:54:25 UTC
This looks like a superset of bug 150065.
Comment 2 Stephen Kennedy 2004-08-16 09:56:12 UTC
*** Bug 150065 has been marked as a duplicate of this bug. ***
Comment 3 Ben Bucksch 2004-08-16 20:55:25 UTC
What I proposed was actually a way to process dirs with *pre-existing* .rej
files, because a number of commandline tools (e.g. arch) leave them behind.
Comment 4 Aidas Kasparas 2004-08-17 06:50:13 UTC
Ben,

I believe Stephen understood your proposal very well and will not close this bug
until functionality you're proposing is present. 

On the other hand, .rej file is a patch file, which does not apply cleanly. So,
to sum up, the following functionality is needed:
1) UI how to apply [unclean] patch to a file;
2) UI to open file/directory with .rej files;
3) UI to open file/directory with .diff file.

(1) could be implemented by extending 3-way file, IMHO. (2) and (3) require menu
and/or open dialog updates.
Comment 5 Stephen Kennedy 2005-02-18 16:06:39 UTC
*** Bug 166351 has been marked as a duplicate of this bug. ***
Comment 6 Stephen Kennedy 2006-05-27 23:22:14 UTC
*** Bug 150063 has been marked as a duplicate of this bug. ***
Comment 7 Ben Bucksch 2006-06-05 19:36:25 UTC
For the record: Dupped bug 150063 asks for not having to interact (or even see) chunks which apply cleanly. I think that's orthogonal to where the patching/merging came from, but you're the developer :).
Comment 8 Gil Forcada 2008-12-10 23:59:40 UTC
Anyone working on this? I really wish this feature to be added :)
Comment 9 GNOME Infrastructure Team 2017-12-13 18:44:43 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/6.