Project

General

Profile

Actions
Copy link

Defect #7615

closed

CVS diffs do not handle new files properly

Added by Jim Naslund almost 14 years ago. Updated over 13 years ago.

Status:
Closed
Priority:
Normal
Assignee:
Toshi MARUYAMA
Category:
SCM
Target version:
1.2.0
Start date:
2011-02-12
Due date:
% Done:

0%

Estimated time:
Resolution:
Fixed
Affected version:

Description

The CVS adapter does not diff new files properly. I've attached a screenshot where the README file is new, but the diff is showing changes from a later revision.

The source of the problem is the base revision used. For example "cvs -d '/cygdrive/c/workspace/redmine/trunk/tmp/test/cvs_repository' rdiff -u -r1 -r1.1 'test/README'" will produce the wrong diff because -r1 is interpreted as a tag. Using -r1.0 is one way to fix the problem.

I've attached a patch that fixes the problem. There was also some code that preventing one line diffs from being shown ... I took it out because it works in this situation, but it may be there for good reason.

By the way, my CVS version is 1.12.13.

Files

Download all files
revision-files.png (52.9 KB) revision-files.png Jim Naslund, 2011-02-12 20:39
revision-diff-after.png (82.2 KB) revision-diff-after.png Jim Naslund, 2011-02-12 20:39
cvs-diff-r4820-trunk.diff (2.78 KB) cvs-diff-r4820-trunk.diff Jim Naslund, 2011-02-12 20:39
revision-diff-before.png (86.2 KB) revision-diff-before.png Jim Naslund, 2011-02-12 20:40

Related issues

Related to Redmine - Defect #7618: SCM diffs do not handle one line new files properlyClosedToshi MARUYAMA2011-02-14

Actions
Actions
Copy link

Also available in: Atom PDF