Page MenuHomeSolus
Differential D9222

Initial commit of kdiff3
ClosedPublic
Actions

Authored by livingsilver94 on Jul 10 2020, 11:02 PM.
Tags
None
Referenced Files
F11020396: D9222.id22238.diff
Mon, Aug 7, 4:43 AM
F11009798: D9222.diff
Wed, Aug 2, 7:57 PM
F11002112: D9222.id22231.diff
Sun, Jul 30, 11:18 PM
F10996886: D9222.diff
Thu, Jul 27, 12:09 AM
F10993249: D9222.id22237.diff
Tue, Jul 25, 4:21 PM
F10989990: D9222.diff
Mon, Jul 24, 6:32 PM
F10913255: D9222.id22236.diff
Jul 7 2023, 9:20 PM
F10871506: D9222.id22231.diff
Jun 18 2023, 3:33 PM
View All 16 Files
Subscribers
Girtablulu
JoshStrobl

Details

Reviewers
JoshStrobl
Group Reviewers
Triage Team
Maniphest Tasks
T5897: Kdiff3 diff tool
Commits
R5041:d8c44a23e0d8: Initial commit of kdiff3
Summary

Inclusion of kdiff3 into Solus repository. Fixes T5897.

Test Plan

Created a simple git repository with two conflicting branches. Merged branch2 into master by solving the conflict with kdiff3.

Diff Detail

Repository
R5041 kdiff3
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

livingsilver94 created this revision.Jul 10 2020, 11:02 PM
Herald added a reviewer: Triage Team. · View Herald TranscriptJul 10 2020, 11:02 PM
livingsilver94 requested review of this revision.Jul 10 2020, 11:02 PM
livingsilver94 added a comment.EditedJul 10 2020, 11:02 PM

TODO

  • Use v1.8.3
  • Disable docs if possible
  • Add MAINTAINERS.md
livingsilver94 updated this revision to Diff 22236.Jul 11 2020, 9:51 AM

Update to 1.8.3 and remove doc. It's not possible to disable its building entirely because that'd also remove manpages.

livingsilver94 updated this revision to Diff 22237.Jul 11 2020, 9:57 AM

Add MAINTAINERS

Girtablulu requested changes to this revision.Jul 11 2020, 9:58 AM
Girtablulu added a subscriber: Girtablulu.

Can you add https://kde.org/applications/en/development/org.kde.kdiff3 as well

package.yml
15

should be pulled in via kparts-->kio

This revision now requires changes to proceed.Jul 11 2020, 9:58 AM
livingsilver94 updated this revision to Diff 22238.Jul 11 2020, 11:30 AM

Remove a redundant dep

livingsilver94 added a comment.Jul 11 2020, 11:31 AM

Only kcoreaddons-devel is redundant. Other packages are needed.

JoshStrobl accepted this revision.Jul 16 2020, 10:07 AM
JoshStrobl removed a reviewer: Girtablulu.
JoshStrobl added a subscriber: JoshStrobl.

LGTM, thanks!

This revision is now accepted and ready to land.Jul 16 2020, 10:07 AM
Closed by commit R5041:d8c44a23e0d8: Initial commit of kdiff3 (authored by livingsilver94, committed by JoshStrobl). · Explain WhyJul 16 2020, 10:08 AM
This revision was automatically updated to reflect the committed changes.
JoshStrobl added a commit: R5041:d8c44a23e0d8: Initial commit of kdiff3.

Revision Contents
Changeset List

PathSize
5 lines
1 line
19 lines
28 lines
181 lines

Diff 22318

View Options

MAINTAINERS.md

Loading...
View Options

Makefile

Loading...
View Options

abi_used_libs

Loading...
View Options

package.yml

Loading...
View Options

pspec_x86_64.xml

Loading...
Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.