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 181628 - Update project from wrong branch
Summary: Update project from wrong branch
Status: RESOLVED INCOMPLETE
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: CVS (show other bugs)
Version: 6.x
Hardware: PC Linux
: P1 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-03-08 05:27 UTC by dext
Modified: 2010-03-09 14:06 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description dext 2010-03-08 05:27:32 UTC
After updating project, which is a dev branch, I get some files from HEAD, with extra new line after every line.

When I check history of that file, I see all versions from HEAD branch (I know, because this file keep data base connection and HEAD have different one), but still, every thing looks like it is dev branch version.
Comment 1 Ondrej Vrabec 2010-03-08 07:00:09 UTC
When you display versioning labels (View -> Show versioning labels), you should see for every folder/file in the projects view, what branch it's in.
So what is displayed for the parent folder of for the file (what branch) and what for the actual file?
If the file is indeed switched to a different branch, then switch it to the correct one. Then try CVS->Update on the project again. Does the problem go away or is the file again in a different branch?
As far as i know, search history shows file's revision from all branches, not just from HEAD or other revision. Maybe you've never branched the file and it's still in HEAD?

Or maybe i misunderstood and the file appears as if it's from the correct (dev) branch (it's correctly labeled in the projects view) but only it's content looks as if from HEAD? Then try to switch the file to HEAD, then to the branch. Does the content change? If not, try the same in commandline, if it still doesn't change, the file is probably the same in both branches and you forgot to change it in the branch.