I'm still finding it difficult to do what I want with CVS branches. There seems to be no very clear way to work in multiple branches of a project at the same time, which seems like it ought to be a basic requirement.
I currently have two branches of my project checked out, head and 1.5. I have two modules defined in my project, one containing each branch. But there seems to be no way to assign a default branch to a module. I also can't assign a default CVS root to a module, which would achieve the same thing.
Generally, IDEA seems to do the right thing, but it's clumsy and it's not clear what it's doing. My specific problems are:
When I check in a file, it doesn't tell me which branch it will check it in to (I have more than once accidentally checked in changes to the wrong branch).
When I check a file's history, it always returns the history for the head branch, even if I explicitly select the 1.5 version.
When I update project, it prompts me for the branch to update from, but clearly it can't update the whole project from one branch. If I update directory on a module, I have to explicitly select the branch to update from.
Am I missing something obvious? How do you guys deal with this? It's an extremely common use case. Should I have a separate project for each branch? That seems like a daft solution, since it's the same project, I want the same settings for both branches.
If there's no easy solution I'll start filing JIRA requests.