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 556005 - Some common cli parameters missing
Some common cli parameters missing
Status: RESOLVED DUPLICATE of bug 321290
Product: meld
Classification: Other
Component: general
1.1.x
Other All
: Normal enhancement
: ---
Assigned To: Stephen Kennedy
Stephen Kennedy
Depends on:
Blocks:
 
 
Reported: 2008-10-12 11:32 UTC by Daniel Esser
Modified: 2010-12-03 22:20 UTC
See Also:
GNOME target: ---
GNOME version: ---


Description Daniel Esser 2008-10-12 11:32:31 UTC 
These parameters would be fine:

-rol -ror -rob  - Read-Only Left/Right/Both or respect the file mode bits
-o <output file> - here the merge goes
-escape - hitting escape will save the merge to output file(s)
Comment 1 Stephen Kennedy 2008-10-13 18:04:05 UTC 
Common in what sense? I've only seen -o before.
Comment 2 Daniel Esser 2008-10-14 13:14:07 UTC 
Hi Stephen!

1. I copied this options from WinMerge. But TortoiseMerge has similar options.
2. Take a look on the task to resolve a conflict for a simple text file README.

If you got a conflict in svn there will exist three files after an update.

README          (conflicts in a patch like syntax)
README.merge    (MINE file)
README.56       (BASE file)
README.57       (THEIRS file)

The common way to resolve this conflict is to merge README.merge with README.57 and write the merge to README. So it would be nice to have README.merge and README.57 read only (if specified on command line). If an output file is given for this merge default saving should go to README specified (if specified on command line).

This escape shortcut is only for convenience if you have to merge a bunch of files.
Comment 3 Kai Willadsen 2010-12-03 22:20:58 UTC 
So read-only file handling is covered by bug 321637, and --output is covered by bug 321290.

I don't see us supporting -escape, since it seems like a dubious use of a common key. On the other hand, if you want to file a bug with suggestions about how we could create a more streamlined merge workflow, then that would be great. There's certainly a lot we could do in this area.

Anyway, closing this bug as a duplicate of the --output bug. Thanks for your bug report.

*** This bug has been marked as a duplicate of bug 321290 ***