exclude from commit - exclude from update

if I have excluded a file from commit,
should it not also be excluded from updating?

if not, an option "exclude from update" would be nice.

use case:
1. I locally modified a file that I do not want to commit.
2. I do "update project"
3. -> my file from step 1 gets merged :(

1 comment
Comment actions Permalink

In article <22805449.1113995286710.JavaMail.itn@is.intellij.net>,
Michael Damberger <michael.damberger@t-online.de> wrote:

if I have excluded a file from commit,
should it not also be excluded from updating?

if not, an option "exclude from update" would be nice.

use case:
1. I locally modified a file that I do not want to commit.
2. I do "update project"
3. -> my file from step 1 gets merged :(


I think this should be hooked into svn:ignore keyword as well. Right
now IDEA seems to ignore that, but not in a good way, it ignores the
ignore :D

I think this should be the function of the VCS you're using. If you
mean that regardless of the VCS you're using, you want to temporarily
override that, I still think it should be VCS specific. I know
subversion allows you to do this, I can't remember if CVS does, it's
been a while since I've worked with it.

R

0

Please sign in to leave a comment.