projects / idea / community.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0fbf032) | patch
IDEA-133398 Do not use "--reintegrate" for merging with svn 1.8+ clients
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 10 Oct 2016 13:21:54 +0000 (16:21 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 11 Oct 2016 01:28:23 +0000 (04:28 +0300)
commit1e291e5e572097eeeab0583ce1f011b3f682b55e
tree239727fdcec3066416d049f0e698b426b1f3be48tree
parent0fbf03256f22c2866d0dc2ec7c707d2a6b594eb4commit | diff
IDEA-133398 Do not use "--reintegrate" for merging with svn 1.8+ clients

svn 1.8+ clients automatically detect if reintegrate merge should be
performed.
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/BaseMergeTask.java diff | blob | history
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/MergeAllWithBranchCopyPointTask.java diff | blob | history
IntelliJ IDEA Community Edition and IntelliJ Platform.