svn: Refactored "MergeTask" - code simplified
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 25 Oct 2016 11:00:46 +0000 (14:00 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 9 Nov 2016 20:53:59 +0000 (23:53 +0300)
commitb7eaa8dfac4ea290195c5596920c137da45aac7b
treea67777f95d74e6888bd6752b404062286fe84303
parent32e11c5639f28cb510c013d8070e6a65558a9a08
svn: Refactored "MergeTask" - code simplified

* Do not wrap usual "Task.Backgroundable" instance into "TaskDescriptor"
* Removed "suspend/ping" logic - start next task in callback
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/BaseMergeTask.java
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/MergeTask.java