This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 66719 - Remote diff using wrong branch
Summary: Remote diff using wrong branch
Status: RESOLVED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: CVS (show other bugs)
Version: 5.x
Hardware: All All
: P1 blocker (vote)
Assignee: issues@versioncontrol
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-10-13 15:12 UTC by xavzeman
Modified: 2007-01-04 17:14 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description xavzeman 2005-10-13 15:12:05 UTC 
Hello,

I was testing the remote diff in the new fantastic 5.0. 
I created a project in netbeans, and pointed my project to a branch in CVS. The
 next day, I launched my Netbeans and check any code changes made against that
branch. I am able to see the list of the modified files and even the history of
each file. BUT when I tried to do a diff, the app by default is trying to
compare my local file against the head instead of my branch.

Xavier.
Comment 1 Maros Sandor 2005-10-13 16:04:08 UTC 
It seems the library does not handle up -p well when on a branch.
Comment 2 Maros Sandor 2005-10-13 16:55:50 UTC 
Diff now compares files to correct branch heads.

/shared/data/ccvs/repository/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/VersionsCache.java,v
 <--  VersionsCache.java
new revision: 1.12; previous revision: 1.11