Defect #7615
CVS diffs do not handle new files properly
| Status: | Closed | Start date: | 2011-02-12 | |
|---|---|---|---|---|
| Priority: | Normal | Due date: | ||
| Assignee: |  Toshi MARUYAMA | % Done: | 0% | |
| Category: | SCM | |||
| Target version: | 1.2.0 | |||
| 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.
revision-files.png (52.9 KB)
revision-diff-after.png (82.2 KB)
cvs-diff-r4820-trunk.diff 
(2.78 KB)
revision-diff-before.png (86.2 KB)
Related issues
Associated revisions
scm: cvs: fix CVS diffs do not handle new files properly (#7615).
Contributed by Jim Naslund.
History
#1
Updated by Jim Naslund over 10 years ago
- File revision-diff-before.png added
#2
Updated by Toshi MARUYAMA over 10 years ago
- Status changed from New to 7
- Assignee set to Toshi MARUYAMA
#3
Updated by Toshi MARUYAMA over 10 years ago
I create new issue #7618 as SCM common issue.
#4
Updated by Toshi MARUYAMA about 10 years ago
- Status changed from 7 to Closed
- Target version set to 1.2.0
- Resolution set to Fixed
Fixed by r4939. Thanks.