Bug 41259 - resolve->edit widget drops empty lines
Summary: resolve->edit widget drops empty lines
Status: CLOSED FIXED
Alias: None
Product: cervisia
Classification: Applications
Component: general (show other bugs)
Version: 1.5rich1
Platform: RedHat Enterprise Linux Linux
: NOR normal
Target Milestone: ---
Assignee: Bernd Gehrmann
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2002-04-18 21:18 UTC by Artur Klauser
Modified: 2002-09-16 14:43 UTC (History)
0 users

See Also:
Latest Commit:
Version Fixed In:

Attachments
Add an attachment

Note You need to log in before you can comment on or make changes to this bug.
Description Artur Klauser 2002-04-18 21:16:49 UTC 
(*** This bug was imported into bugs.kde.org ***)

Package:           cervisia
Version:           1.5rich1 (using KDE 3.0.0 )
Severity:          normal
Installed from:    Red Hat Linux 7.2.92
Compiler:          gcc version 2.96 20000731 (Red Hat Linux 7.2 2.96-109)
OS:                Linux (i686) release 2.4.9-31
OS/Compiler notes: 

When trying to resolve merge conflicts with the
left-click->resolve->edit widget emtpy lines in the chosen version get swallowed. e.g.
version A:
//---
foo();

bar();
//---

ends up in the edit widget as:
//---
foo();
bar();
//---

ie. dropping line 3 from above.

(Submitted via bugs.kde.org)
(Called from KBugReport dialog)
Comment 1 Bernd Gehrmann 2002-06-25 18:39:55 UTC 
Not reproducible here. If it still happens with the current version
in the KDE repository please include the file with which the
problem ocurred in the bug report.