[kdiff3] [Bug 499331] KDiff3 displays error message when saving a completed merge.

2025-03-11 Thread michael
https://bugs.kde.org/show_bug.cgi?id=499331 michael changed: What|Removed |Added Status|CONFIRMED |RESOLVED Resolution|---

[kdiff3] [Bug 499331] KDiff3 displays error message when saving a completed merge.

2025-03-07 Thread michael
https://bugs.kde.org/show_bug.cgi?id=499331 --- Comment #12 from michael --- This patch to 1.12 will produce a error message in the event of encoding failure. A console message will generated if encoding fails to produce an data. With 1.12 GUI messages can't be added so I will look what else I c

[kdiff3] [Bug 499331] KDiff3 displays error message when saving a completed merge.

2025-03-07 Thread michael
https://bugs.kde.org/show_bug.cgi?id=499331 --- Comment #8 from michael --- Please open a new bug for the save failing. This bug can referenced there as the that change made her may be related. -- You are receiving this mail because: You are watching all bug changes.

[kdiff3] [Bug 499331] KDiff3 displays error message when saving a completed merge.

2025-03-06 Thread michael
https://bugs.kde.org/show_bug.cgi?id=499331 michael changed: What|Removed |Added Priority|NOR |HI -- You are receiving this mail because: You are w

[kdiff3] [Bug 499331] KDiff3 displays error message when saving a completed merge.

2025-03-06 Thread michael
https://bugs.kde.org/show_bug.cgi?id=499331 michael changed: What|Removed |Added Status|REOPENED|CONFIRMED -- You are receiving this mail because: Yo

[kdiff3] [Bug 499331] KDiff3 displays error message when saving a completed merge.

2025-03-06 Thread michael
https://bugs.kde.org/show_bug.cgi?id=499331 --- Comment #11 from michael --- Going push a stop gap fix to 1.12 to prevent merges from being saved if the encoding error flag is triggered. Not the complete answer but will prevent data loss until I can sort out what is happening in full. Master has

[kdiff3] [Bug 499331] KDiff3 displays error message when saving a completed merge.

2025-03-06 Thread michael
https://bugs.kde.org/show_bug.cgi?id=499331 --- Comment #10 from michael --- What are your encoding settings? -- You are receiving this mail because: You are watching all bug changes.

[kdiff3] [Bug 499331] KDiff3 displays error message when saving a completed merge.

2025-03-06 Thread michael
https://bugs.kde.org/show_bug.cgi?id=499331 --- Comment #9 from michael --- Encoding of the data stream is failing in the question is why? For stable it is not possible to add a separate error string for this due to string freeze. Master has this implemented. Erroring seems the better of the two

[kdiff3] [Bug 499331] KDiff3 displays error message when saving a completed merge.

2025-03-06 Thread Chad
https://bugs.kde.org/show_bug.cgi?id=499331 Chad changed: What|Removed |Added Resolution|FIXED |--- Status|RESOLVED|REOP

[kdiff3] [Bug 499331] KDiff3 displays error message when saving a completed merge.

2025-02-07 Thread michael
https://bugs.kde.org/show_bug.cgi?id=499331 michael changed: What|Removed |Added Latest Commit|https://invent.kde.org/sdk/ |https://invent.kde.org/sdk/ |kdiff3

[kdiff3] [Bug 499331] KDiff3 displays error message when saving a completed merge.

2025-02-07 Thread michael
https://bugs.kde.org/show_bug.cgi?id=499331 michael changed: What|Removed |Added Resolution|--- |FIXED Status|REOPENED

[kdiff3] [Bug 499331] KDiff3 displays error message when saving a completed merge.

2025-02-06 Thread michael
https://bugs.kde.org/show_bug.cgi?id=499331 michael changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|DUPLICATE

[kdiff3] [Bug 499331] KDiff3 displays error message when saving a completed merge.

2025-02-06 Thread michael
https://bugs.kde.org/show_bug.cgi?id=499331 --- Comment #4 from michael --- I think I see what caused this will attempt a fix shortly. -- You are receiving this mail because: You are watching all bug changes.

[kdiff3] [Bug 499331] KDiff3 displays error message when saving a completed merge.

2025-02-06 Thread michael
https://bugs.kde.org/show_bug.cgi?id=499331 michael changed: What|Removed |Added Latest Commit|09b2adaa9e4dc89d02d6cff1e38 | |7408d5c5e2dbe | --

[kdiff3] [Bug 499331] KDiff3 displays error message when saving a completed merge.

2025-02-06 Thread michael
https://bugs.kde.org/show_bug.cgi?id=499331 michael changed: What|Removed |Added Latest Commit||09b2adaa9e4dc89d02d6cff1e38 |

[kdiff3] [Bug 499331] KDiff3 displays error message when saving a completed merge.

2025-02-06 Thread michael
https://bugs.kde.org/show_bug.cgi?id=499331 michael changed: What|Removed |Added Resolution|--- |DUPLICATE Status|REPORTED