Version: 2.1 (using KDE KDE 3.2.0) Installed from: Debian stable Packages OS: Linux The resolve editor shows conflict markers after an update. It's seems to be because no new line was added by cvs. The result of the update is: Ceci est un premier fichier dans le CVS abc efg def <<<<<<< abc.txt ================ *************>>>>>>> 1.19 The resolve editor shows *************>>>>>>> 1.19 in the B version (line 5) and nothing in the A version (at lin 5).
I can send a screenshot if you want.
Created attachment 4631 [details] Screenshot
Sorry, I can't reproduce this conflict ATM. Could you please add some information about what steps lead to this strange conflict? Also please add the cvs version you are using. Thanks in advance! Christian
C1 = Computer 1 Linux Cervisia 2.1 KDE 3.2.0 CVS 1.12.5 C2 = Computer 2 Windows TortoiseCVS ----- Steps: 1- Create test.txt (+ add + commit) on C1 test.txt [1.1]: 123 2- Modify test.txt (+ commit) on C2 test.txt [1.2]: 123 456 3- Modify test.txt on C1 test.txt [Local based on 1.1] 123 conf 4- Update test.txt on C1 We have a conflict on line 2: 456 in the repository [1.2] and con in the local copy. 5- Resolve in Cervisia Version A: 1 123 2 conf======= 3 456>>>>>>>1.2 Version B: 1 123
Thanks a lot for the additional info. Unfortunately it still works here. Could you please attach the test.txt file with the conflict to this report. I could then take a closer look at the hex values of the file. Bye Christian
Created attachment 4753 [details] The conflict file
IMHO the resolve dialog is okay, because the conflict that cvs added to the file is broken. There are two new line markers missing (neither CR nor CRLF exist). I think this is because of the mixed use of unix and windows programs. Please also look here for more information: - TortoiseCVS bug reports #835744 or #873765 on http://sourceforge.net/projects/tortoisecvs - http://www.tortoisecvs.org/faq.html#sharelinux - http://sf.net/mailarchive/forum.php?thread_id=3828481&forum_id=8052 I'm sorry but I don't think that there is much we can do about it. I leave open for now, because I will try to find some more info but otherwise I tend to close this as INVALID. Christian
I couldn't find anything that shows that this is a problem in Cervisia. The cvs client messed up the conflict markers on update. As I already said, probably because of the mixed use of Windows and Linux. This hints to a problem in the cvs client or cvs server. You might want to file a bug report at http://www.cvshome.org. Sorry that I couldn't be more helpful! Christian
I could reproduce this bug now. It happens when the file doesn't end with a new line marker. It actually makes sense since cvs would otherwise change the file content. Sorry about the confusion and thanks for all the info! Christian
CVS commit by cloose: * Fix BR #74903: Don't choke on conflict markers that are not on a separate line in the resolve dialog. This happens when the file didn't end with a new line marker before CVS encountered the conflict. CCMAIL: 74903-done@bugs.kde.org M +6 -1 ChangeLog 1.115 M +107 -58 resolvedlg.cpp 1.28 M +6 -0 resolvedlg.h 1.12
Reopen this report because the fix for Bug 82853 reintroduces this problem. Please see the comment section of Bug 82853 for the reasons why.
has this bug been fixed on more recent version (Cervisia 3.0.0) ?
Thank you for the bug report. As this report hasn't seen any changes in 5 years or more, we ask if you can please confirm that the issue still persists. If this bug is no longer persisting or relevant please change the status to resolved.