![]() |
2014-04-23
, 19:06
|
|
Posts: 4,118 |
Thanked: 8,901 times |
Joined on Aug 2010
@ Ruhrgebiet, Germany
|
#92
|
MC will compare the two files which are currently under the cursor (selected, not tagged). This works, at least in my case, consistently fine.
~ $ mc --version GNU Midnight Commander 4.8.10 Kompiliert mit GLib 2.20.3 Using the S-Lang library with terminfo database Mit eingebautem Editor With subshell support as default Mit Unterstützung für Hintergrundtätigkeiten Mit Maus-Unterstützung für xterm Mit Internationalisierungs-Unterstützung Mit mehrfach Codepage-Unterstützung Virtuelles Dateisystem: cpiofs, tarfs, sfs, extfs, ftpfs, fish Datentyp: char: 8; int: 32; long: 32; void *: 32; size_t: 32; off_t: 64;
![]() |
2014-04-23
, 19:16
|
|
Posts: 2,222 |
Thanked: 12,651 times |
Joined on Mar 2010
@ SOL 3
|
#93
|
For me that did not work (even I expected it to be this "work flow")!
my version of mc: 4.8.10 (from devel)
The Following User Says Thank You to joerg_rw For This Useful Post: | ||
![]() |
2014-04-23
, 19:45
|
Posts: 2,076 |
Thanked: 3,268 times |
Joined on Feb 2011
|
#94
|
and your diff is in path and working? What's the error you get? You didn't tag any files, did you? Diff doesn't work with tagged files afaik, it's sematically ambiguous since you could tag A, B, C on left side and b, f on right side, what diff gonna do? you can diff whole dirs, or a single file left to a single file right - in both cases tagging makes no sense and possibly breaks the diff function
again for clarity, the workflow: move to a dir on left side, move highlight (focus, cursor) to a file in that dir. switch to right side via <tab>, move cursor there to any arbitrary other file. Then <F9> and select "compare files" from commands menu http://wstaw.org/m/2014/04/23/plasma-desktopB31889.png
btw "merge" (F5) seems to yield nonsensical results for me, possibly same/similar problem? [edit] seems F5 doesn't work even on my PC (jr@saturn:~> mc --version GNU Midnight Commander 4.8.10)
![]() |
2014-04-23
, 19:54
|
|
Posts: 2,222 |
Thanked: 12,651 times |
Joined on Mar 2010
@ SOL 3
|
#95
|
4.8.10 on jolla, merge works fine it seems (compared two similar files, one with extra line, after merge it got added to the other and asked if to save changes on exit)
Diff viewer
Bidirectional merge (F5 merge left-to-right, F15 - merge right-to-left) (#2863)
mcdiffviewer can merge only from right panel to left panel file.
It will be nice, if -- similar to edit and edit other -- mcdiffviewer can merge hunks into the opposite directions too.
This patch add this feature to mcdiffviewer. With F15 mcdiffviewer merge left panel to right panel direction.
![]() |
2014-04-23
, 20:25
|
Posts: 2,076 |
Thanked: 3,268 times |
Joined on Feb 2011
|
#96
|
Well, when I try to "merge" two quite different files, it simply replaces one side with the other side. It doesn't ask what to merge, nor does it take sections from both files. Maybe my idea of what's "merge" is flawed. Maybe my test been flawed. Whatever, it works same way on PC and fremantle. So no bug. There are a few flaws in MC (all platforms), like hexedit not available from F4-edit, you need to F3-display the file, then switch from there to "hex" view, then "edit file". Prolly about F5-merge it's similarly tricky
The Following User Says Thank You to szopin For This Useful Post: | ||
![]() |
2014-04-23
, 20:31
|
|
Posts: 4,118 |
Thanked: 8,901 times |
Joined on Aug 2010
@ Ruhrgebiet, Germany
|
#97
|
and your diff is in path and working? What's the error you get? You didn't tag any files, did you? Diff doesn't work with tagged files afaik, it's sematically ambiguous since you could tag A, B, C on left side and b, f on right side, what diff gonna do? you can diff whole dirs, or a single file left to a single file right - in both cases tagging makes no sense and possibly breaks the diff function
again for clarity, the workflow: move to a dir on left side, move highlight (focus, cursor) to a file in that dir. switch to right side via <tab>, move cursor there to any arbitrary other file. Then <F9> and select "compare files" from commands menu http://wstaw.org/m/2014/04/23/plasma-desktopB31889.png
btw "merge" (F5) seems to yield nonsensical results for me, possibly same/similar problem? [edit] seems F5 doesn't work even on my PC (jr@saturn:~> mc --version GNU Midnight Commander 4.8.10)
![]() |
2014-04-23
, 21:47
|
|
Posts: 2,222 |
Thanked: 12,651 times |
Joined on Mar 2010
@ SOL 3
|
#98
|
lrwxrwxrwx 1 root root 14 2010-11-11 04:08 /usr/bin/mc -> /opt/mc/bin/mc
#!/bin/sh export PATH=/usr/bin/gnu:$PATH exec /opt/mc/bin/mc "$@"
The Following 5 Users Say Thank You to joerg_rw For This Useful Post: | ||
![]() |
2014-04-24
, 08:41
|
Posts: 1,808 |
Thanked: 4,272 times |
Joined on Feb 2011
@ Germany
|
#99
|
The Following User Says Thank You to reinob For This Useful Post: | ||
which is terribly out of date and not in sync with my IroN900 obviously, but anyway serves for answering your question.
Maemo Community Council member [2012-10, 2013-05, 2013-11, 2014-06 terms]
Hildon Foundation Council inaugural member.
MCe.V. foundation member
EX Hildon Foundation approved Maemo Administration Coordinator (stepped down due to bullying 2014-04-05)
aka "techstaff" - the guys who keep your infra running - Devotion to Duty http://xkcd.com/705/
IRC(freenode): DocScrutinizer*
First USB hostmode fanatic, father of H-E-N