Ticket #120 (closed enhancement: fixed) — at Version 19
savannah: compare files command would be nice to have in mc
| Reported by: | mr_zbiggy | Owned by: | angel_il |
|---|---|---|---|
| Priority: | minor | Milestone: | 4.7.2 |
| Component: | mc-core | Version: | master |
| Keywords: | Cc: | dborca@… | |
| Blocked By: | Blocking: | ||
| Branch state: | merged | Votes for changeset: | committed-master |
Description (last modified by ossi) (diff)
Original: http://savannah.gnu.org/bugs/?20739
| Submitted by: | Zbigniew Luszpinski <mr_zbiggy> | Submitted on: | Thu 09 Aug 2007 08:45:04 PM UTC |
| Category: | Core | Severity: | 3 - Normal |
| Status: | None | Privacy: | Public |
| Assigned to: | None | Open/Closed: | Open |
| Release: | 4.6.1 | Operating System: | GNU/Linux |
Original submission:
compare files command would be nice to have in mc. Mc could use diff util as an engine by providing paths to files as diff arguments and parsing diff output. This would be very helpful if someone in the future would like to add synchronize directories command to mc.
Comment 1 by Pavel Tsekov <ptsekov> at Thu 23 Aug 2007 01:49:25 PM UTC:
You may want to try/test the following patch: [http://savannah.gnu.org/patch/?5893 patch #5893] - integrated side-by-side textmode diff viewer
Change History
comment:1 Changed 16 years ago by metux
- Priority changed from major to minor
- Type changed from defect to enhancement
Changed 16 years ago by dborca
- Attachment mc-4.6.2.ydiff_full.patch.gz added
file diff + dir diff against 4.6.2 release
comment:3 Changed 16 years ago by styx
- Version 4.6.1 deleted
- Milestone changed from 4.7 to future releases
Changed 15 years ago by dborca
- Attachment mc-4.7.0-pre1.ydiff-full.patch.gz added
Quick fixes for 4.7.0-pre1
comment:4 Changed 15 years ago by dborca
- Cc dborca@… added
- Component changed from mcedit to mc-core
- severity set to no branch
comment:8 Changed 15 years ago by angel_il
- severity changed from no branch to on rework
- Milestone changed from 4.7 to 4.7.2
branch: 120_diff_view
comment:9 Changed 15 years ago by angel_il
- severity changed from on rework to on review
initial changeset: 78ef198acae7d907ce876fda40bb705227492698
please review
comment:10 Changed 15 years ago by angel_il
- Status changed from new to accepted
- Owner set to angel_il
initial commit: 07d1eb0019950d70252789fd93c48ea5534485c4
branch: 120_diff_view
comment:12 Changed 15 years ago by angel_il
- Votes for changeset changed from slavazanko to slavazanko angel_il
initial commit: 329ef3846a3d4f1764ad1040c8351acdd343632c
comment:13 Changed 15 years ago by andrew_b
- Votes for changeset changed from slavazanko angel_il to slavazanko andrew_b
- Version set to master
- severity changed from on review to approved
comment:14 follow-up: ↓ 15 Changed 15 years ago by angel_il
- Status changed from accepted to testing
- Votes for changeset changed from slavazanko andrew_b to committed-master
- Resolution set to fixed
- severity changed from approved to merged
comment:15 in reply to: ↑ 14 ; follow-up: ↓ 18 Changed 15 years ago by dborca
Replying to angel_il:
There is a subtle bug in horizontal diff:
1126 if ((*p)[0] == off0)
1127 {
1128 break;
1129 }
1130 if ((*p)[1] == off1)
1131 {
1132 break;
1133 }
Because (*p)[0] dictates order and (*p)[1] must be monotonic with respect to that:
1126 if ((*p)[0] == off0)
1127 {
1128 break;
1129 }
1130 if ((*p)[1] >= off1)
1131 {
1132 break;
1133 }
Test case: abcdefghij <-> fghijabcde
comment:16 Changed 15 years ago by dborca
xdiff = Binary diff (ala vbindiff), just for the sake of it.
comment:17 Changed 15 years ago by andrew_b
#2159: fix of rpm spec.
comment:18 in reply to: ↑ 15 Changed 15 years ago by angel_il
- Status changed from testing to closed
Replying to dborca:
Replying to angel_il:
There is a subtle bug in horizontal diff:
1126 if ((*p)[0] == off0) 1127 { 1128 break; 1129 } 1130 if ((*p)[1] == off1) 1131 { 1132 break; 1133 }Because (*p)[0] dictates order and (*p)[1] must be monotonic with respect to that:
1126 if ((*p)[0] == off0) 1127 { 1128 break; 1129 } 1130 if ((*p)[1] >= off1) 1131 { 1132 break; 1133 }Test case: abcdefghij <-> fghijabcde
fixed: bc0ad9446136f87aab30e02a02cb1cf564332779
about xdiff i think need new ticket...
comment:19 Changed 11 years ago by ossi
- Description modified (diff)
- Branch state set to no branch
- Reporter changed from slavazanko to mr_zbiggy
