IDEA-22730 (Improve support for common merging/integration use cases)
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 23 Apr 2010 21:11:32 +0000 (01:11 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 23 Apr 2010 21:11:32 +0000 (01:11 +0400)
commit5929bd8387b56502113d934e120b38a7ee490d6c
tree12a92a52b95d590d214f450c0274c270d1161921
parent356e709a271ba75a12de63411f2c575204198af3
IDEA-22730 (Improve support for common merging/integration use cases)
37 files changed:
platform/vcs-api/src/com/intellij/openapi/vcs/CollectionSplitter.java [new file with mode: 0644]
platform/vcs-api/src/com/intellij/openapi/vcs/update/FileGroup.java
platform/vcs-api/src/com/intellij/openapi/vcs/update/UpdatedFiles.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangeListRenderer.java [new file with mode: 0644]
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowser.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java
plugins/git4idea/src/git4idea/history/browser/FictiveTableCellRenderer.java
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties
plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ChangeListsMergerFactory.java
plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ChangeSetMergerFactory.java
plugins/svn4idea/src/org/jetbrains/idea/svn/actions/RecordOnlyMergerFactory.java
plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SelectBranchPopup.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/BasePageEngine.java [new file with mode: 0644]
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/BranchMerger.java [new file with mode: 0644]
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopiesPanel.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PageEngine.java [new file with mode: 0644]
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java [new file with mode: 0644]
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/QuantitySelection.java [new file with mode: 0644]
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectionManipulation.java [new file with mode: 0644]
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectionResult.java [new file with mode: 0644]
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnChangeListsPageEngine.java [new file with mode: 0644]
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java [new file with mode: 0644]
plugins/svn4idea/src/org/jetbrains/idea/svn/history/FirstInBranch.java
plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnChangeList.java
plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnMergeSourceDetails.java
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/IMerger.java [new file with mode: 0644]
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/Merger.java
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/MergerFactory.java
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/ResolveWorker.java
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnIntegrateChangesActionPerformer.java
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnIntegrateChangesTask.java
plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/BranchInfo.java
plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/SvnMergeInfoCache.java
plugins/svn4idea/src/org/jetbrains/idea/svn/update/AbstractSvnUpdateIntegrateEnvironment.java
plugins/svn4idea/src/org/jetbrains/idea/svn/update/UpdateEventHandler.java