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 150065 - Load dir with rej files
Load dir with rej files
Status: VERIFIED DUPLICATE of bug 150178
Product: meld
Classification: Other
Component: dirdiff
0.9.x
Other Linux
: Normal enhancement
: ---
Assigned To: Stephen Kennedy
Stephen Kennedy
Depends on:
Blocks:
 
 
Reported: 2004-08-13 16:50 UTC by Ben Bucksch
Modified: 2009-08-15 18:40 UTC
See Also:
GNOME target: ---
GNOME version: ---


Description Ben Bucksch 2004-08-13 16:50:09 UTC 
I don't see how I would load a directory which has already been partially merged
(e.g. by patch, CVS or arch), but has .rej and .orig files for the conflicts.
Comment 1 Stephen Kennedy 2004-08-13 17:14:01 UTC 
Simply, you can't. Definitely nice to have and not too difficult to implement
though.

Can you attach a test case (or script to generate one) using all the "special"
file names?
Comment 2 Ben Bucksch 2004-08-13 17:39:09 UTC 
> Can you attach a test case (or script to generate one) using all the "special"
> file names?

Just the output of CVS, arch and patch. (I think arch behaves like patch.)
Comment 3 Stephen Kennedy 2004-08-16 09:56:11 UTC 
Bug 150178 seems to be a superset of this bug.

*** This bug has been marked as a duplicate of 150178 ***
Comment 4 Stephen Kennedy 2005-01-21 18:10:24 UTC 
Closing old bugs.