new Switched Files in 6763

With 6763 when I work on by production branch CVS project, suddenly nearly all my files (over 18.000) are listed in the Switched Files, and are colored Cyan in the project view.

I'd like to understand the conditions under which files are listed in the Switched Files view, and how I can prevent the bulk of my files from landing in this state.

Regards,

Maarten

0
8 comments

Hello Maarten,

With 6763 when I work on by production branch CVS project, suddenly
nearly all my files (over 18.000) are listed in the Switched Files,
and are colored Cyan in the project view.

I'd like to understand the conditions under which files are listed in
the Switched Files view, and how I can prevent the bulk of my files
from landing in this state.


Currently the condition is simple: switched status is applied if the sticky
tag of a file or directory is different from the sticky tag of its parent.
Looks like we also need to check that the parent is under the project content
root.

--
Dmitry Jemerov
Software Developer
JetBrains, Inc.
http://www.jetbrains.com/
"Develop with Pleasure!"


0

I think it is a good idea, but it needs a little work. I am more concerned with any files that are not in the branch that I am working in (even if it is head).

What is sorely missing is a way to know what branch you are working in (if any) and an easy way to locate any files that did not make it into your branch.

0

Hello Norris,

I think it is a good idea, but it needs a little work. I am more
concerned with any files that are not in the branch that I am working
in (even if it is head).


Well, that's exactly what will be shown, isn't it?

What is sorely missing is a way to know what branch you are working in
(if any) and an easy way to locate any files that did not make it into
your branch.


If you're working in a branch, files in HEAD will be shown as switched in
the Changes view.

Suggestions for the place to display the top-level branch you're working
in are welcome.

--
Dmitry Jemerov
Software Developer
JetBrains, Inc.
http://www.jetbrains.com/
"Develop with Pleasure!"


0

Maybe it is possible to display the name of the branch somewhere?
For instance on every cvs-root in the Packages panel or as a tooltip on every file.

Greetings
Henne

0
Avatar
Maarten Hazewinkel

Hi Dmitry

With 6763 when I work on by production branch CVS

project, suddenly

nearly all my files (over 18.000) are listed in the

Switched Files,

and are colored Cyan in the project view.

I'd like to understand the conditions under which

files are listed in

the Switched Files view, and how I can prevent the

bulk of my files

from landing in this state.


Currently the condition is simple: switched status is
applied if the sticky
tag of a file or directory is different from the
sticky tag of its parent.


Ok thanks.
This doesn't appear to work correctly in all cases. It works for file directly in the base CVS module, but not for files that are in subdirectories. Both the checked out CVS module directory and it subdirectories have the same Tag file in the CVS control directory, which is the same as the tag on all the file entries in the Entries file for all files in these directories.
The files in the subdirectories are (incorrectly) listed as Switched, while the files in the main module directory are not so listed.

Would you like a Jira with that? Its at
http://www.jetbrains.net/jira/browse/IDEA-12083

Looks like we also need to check that the parent is
under the project content
root.


At first glance this does not appear to be related to my problem.

Regards,

Maarten

0

What I see on my screen is my working folders, then there is an additional folder called Switched files. It is labeled as tag tagname_ All of the switched files are shown in a green/blue color.

Perhaps it is working correctly and showing that I am not working in my branch as I expect.

0

Hello Norris,

What I see on my screen is my working folders, then there is an
additional folder called Switched files. It is labeled as tag
tagname_ All of the switched files are shown in a green/blue color.

Perhaps it is working correctly and showing that I am not working in
my branch as I expect.


Please test the new build 6776. The implementation has been rewritten and
now works (hopefully) as expected.

--
Dmitry Jemerov
Software Developer
JetBrains, Inc.
http://www.jetbrains.com/
"Develop with Pleasure!"


0

I have tried the new version. Here is what I think I see.

I am working in an older branch and I see

1) My current change list with modified, uncommitted files. At the bottom, there is a Switched Files change
2) Switched Files with a HEAD node with a bunch of files

Are these files that have been changed since the branch?


When I switch to the head branch, I see a Switched Files folder with a tag .... entry. Are these files that were changed after the version that I have? I also see one of my files that is a changed folders list that has


I think there is a lot more functionality added and we are almost there. Is there the ability to change the heading of the box (at the top) that has the branch in brackets? If not, can you add a parent node that shows the branch (hopefully without a node for head).

0

Please sign in to leave a comment.