VCS: apply patch: warn about already existing - to be created; suggest to add/remove...
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 2 Jul 2010 12:43:38 +0000 (16:43 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 2 Jul 2010 12:43:38 +0000 (16:43 +0400)
commitd64fbc13cafc73a5eb5a7b89d719fd5d6071ece9
treedab0a03d3323f53ef13ffc4c01767d20c47a64d4
parentb5f12dd1ae2a378896ae35138876dc291ac0900e
VCS: apply patch: warn about already existing - to be created; suggest to add/remove to VCS already existing additions/deletions
15 files changed:
platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java
platform/vcs-api/src/com/intellij/openapi/vcs/VcsShowConfirmationOption.java
platform/vcs-api/src/com/intellij/util/ui/ConfirmationDialog.java
platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/formove/PatchApplier.java
platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/formove/PathMerger.java
platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/formove/PathsVerifier.java
platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/formove/TriggerAdditionOrDeletion.java [new file with mode: 0644]
platform/vcs-impl/src/com/intellij/openapi/vcs/VcsShowConfirmationOptionImpl.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/AbstractSelectFilesDialog.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitHelper.java
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsVcs2.java
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java