[eclipse-subclipse] 01/05: Merge tag 'upstream/1.10.3'

Jakub Adam xhaakon-guest at moszumanska.debian.org
Fri Feb 21 22:46:44 UTC 2014


This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository eclipse-subclipse.

commit a0878cfa7e371647062ceb0afc4be636f600a0f0
Merge: 087a8bb 377eef8
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Feb 21 23:20:18 2014 +0100

    Merge tag 'upstream/1.10.3'
    
    Upstream version 1.10.3

 .../feature.xml                                    |   4 +-
 .../feature.xml                                    |   6 +-
 .../META-INF/MANIFEST.MF                           |   4 +-
 .../META-INF/MANIFEST.MF                           |   4 +-
 .../META-INF/MANIFEST.MF                           |   4 +-
 .../feature.xml                                    |   8 +-
 .../META-INF/MANIFEST.MF                           |   6 +-
 org.tigris.subversion.clientadapter/.classpath     |   2 +-
 .../.settings/org.eclipse.jdt.core.prefs           |  12 +-
 .../META-INF/MANIFEST.MF                           |   4 +-
 .../META-INF/MANIFEST.MF                           |   4 +-
 org.tigris.subversion.subclipse.core/plugin.xml    |  52 ++
 .../subclipse/core/ISVNCoreConstants.java          |   1 +
 .../subclipse/core/ISVNLocalResource.java          |  10 +
 .../subclipse/core/PreferenceInitializer.java      |   1 +
 .../subclipse/core/client/PeekStatusCommand.java   |   5 +-
 .../core/commands/CleanupResourcesCommand.java     |   8 +-
 .../subclipse/core/commands/GetStatusCommand.java  |   5 +-
 .../subversion/subclipse/core/messages.properties  |   2 +
 .../subclipse/core/repo/SVNRepositories.java       |   3 -
 .../subclipse/core/repo/SVNRepositoryLocation.java | 102 +---
 .../subclipse/core/resources/LocalResource.java    |  17 +
 .../core/resources/LocalResourceStatus.java        |  54 +-
 .../core/resources/RemoteResourceStatus.java       |  10 +
 .../subclipse/core/resources/ResourceStatus.java   |   7 +-
 .../core/resources/SVNMoveDeleteHook.java          |  80 +--
 .../FileModificationManager.java                   |  53 +-
 .../resourcesListeners/RevertResourceManager.java  | 121 +++--
 .../subclipse/core/status/StatusCacheManager.java  |   8 +-
 .../core/status/StatusUpdateStrategy.java          |  18 +-
 .../subclipse/core/sync/SVNStatusSyncInfo.java     |   8 +
 .../feature.xml                                    |   6 +-
 .../subclipse/changes.html                         | 566 ++++-----------------
 .../META-INF/MANIFEST.MF                           |   2 +-
 .../icons/full/obj16/url_source_repo.gif           | Bin 0 -> 612 bytes
 .../icons/full/ovr16/moved_ov.gif                  | Bin 0 -> 81 bytes
 .../icons/full/wizards/cloudforge.png              | Bin 0 -> 15082 bytes
 org.tigris.subversion.subclipse.ui/plugin.xml      |   3 +-
 .../schema/svnRepositorySourceProviders.exsd       |  80 +++
 .../subclipse/ui/ISVNRepositorySourceProvider.java |  52 ++
 .../subversion/subclipse/ui/ISVNUIConstants.java   |   4 +
 .../subversion/subclipse/ui/ImageDescriptors.java  |   5 +-
 .../tigris/subversion/subclipse/ui/Messages.java   |   6 +
 .../subversion/subclipse/ui/SVNUIPlugin.java       |  30 ++
 .../subclipse/ui/SVNUIPreferenceInitializer.java   |   1 +
 .../subclipse/ui/actions/CheckoutAsAction.java     |   3 +-
 .../subclipse/ui/actions/CheckoutWizardAction.java |   3 +-
 .../ui/actions/CompareRemoteResourcesAction.java   |  17 +
 .../subclipse/ui/actions/NewRepositoryAction.java  |   4 +-
 .../subclipse/ui/actions/RelocateAction.java       |   3 +-
 .../ui/actions/RemoteResourceTransfer.java         |  15 +-
 .../ui/actions/ReplaceWithBranchTagAction.java     |  67 +++
 .../ui/actions/SVNPropertyDeleteAction.java        |   2 +
 .../ui/actions/SVNPropertyModifyAction.java        |   2 +
 .../subclipse/ui/actions/SetSvnPropertyAction.java |   3 +-
 .../ShowDifferencesAsUnifiedDiffAction.java        |  22 +
 .../subclipse/ui/actions/UpdateAction.java         |   2 +-
 .../ui/authentication/PasswordPromptDialog.java    |   4 +-
 .../ui/authentication/QuestionDialog.java          |   4 +-
 .../ui/authentication/SSHPromptDialog.java         |   4 +-
 .../ui/authentication/SSLClientCertificate.java    |   4 +-
 .../ui/authentication/TrustSSLServerDialog.java    |   4 +-
 .../ui/authentication/UserPromptDialog.java        |   4 +-
 .../subclipse/ui/comments/CommitCommentArea.java   |  48 ++
 .../ui/compare/SVNLocalBaseCompareInput.java       |  35 ++
 .../subclipse/ui/compare/SVNLocalCompareInput.java | 317 +++++++++++-
 .../ui/compare/SVNLocalCompareSummaryInput.java    |  54 +-
 .../subclipse/ui/compare/SVNLocalResourceNode.java |   8 +-
 .../ui/compare/SVNLocalResourceSummaryNode.java    |   9 +-
 .../subclipse/ui/compare/SummaryEditionNode.java   |  19 +-
 .../ui/conflicts/ConflictHandlingWizardPage.java   |  99 ++--
 .../MergeFileAssociationPreferencePage.java        |   3 +-
 .../ui/conflicts/ResolveTreeConflictWizard.java    |  70 ++-
 .../ResolveTreeConflictWizardMainPage.java         |  48 +-
 .../ui/conflicts/SVNConflictResolver.java          |  56 +-
 .../ui/decorator/SVNLightweightDecorator.java      | 185 ++++---
 .../subclipse/ui/dialogs/ChooseUrlDialog.java      |   3 +-
 .../subclipse/ui/dialogs/CompareDialog.java        |   3 +-
 .../subclipse/ui/dialogs/DifferencesDialog.java    |   7 +
 .../subclipse/ui/dialogs/HistoryDialog.java        |   3 +-
 .../ui/dialogs/IgnoreResourcesDialog.java          |   3 +-
 .../subclipse/ui/dialogs/ImportFolderDialog.java   |   3 +-
 .../ui/dialogs/RemoteResourcePropertiesDialog.java |   3 +-
 .../ui/dialogs/SetCommitPropertiesDialog.java      |   3 +-
 .../ShowDifferencesAsUnifiedDiffDialog.java        |   3 +-
 .../ShowDifferencesAsUnifiedDiffDialogWC.java      |  10 +-
 .../subclipse/ui/dialogs/ShowRevisionsDialog.java  |   3 +-
 .../subclipse/ui/dialogs/SubclipseTrayDialog.java  |  22 +
 .../subversion/subclipse/ui/dialogs/SvnDialog.java |   3 +-
 .../subclipse/ui/editor/RemoteFileEditorInput.java |   3 +-
 .../subclipse/ui/history/SVNHistoryPage.java       |  25 +-
 .../subversion/subclipse/ui/messages.properties    |  28 +-
 .../ui/operations/ReplaceWithRemoteOperation.java  |  66 +++
 .../ui/operations/RepositoryProviderOperation.java |  21 +-
 .../subclipse/ui/operations/UpdateOperation.java   |   6 +-
 .../preferences/SVNDecoratorPreferencesPage.java   |  49 +-
 .../ui/preferences/UpdateToHeadPreferencePage.java |  46 ++
 .../subclipse/ui/properties/SVNPropertyPage.java   |  72 ++-
 .../subclipse/ui/repository/RepositoriesView.java  |   3 +-
 .../subclipse/ui/settings/CommentProperties.java   |  77 ++-
 .../subclipse/ui/settings/ProjectProperties.java   | 142 +++---
 .../subclipse/ui/subscriber/CommitSetDialog.java   |   4 +-
 .../ui/subscriber/IgnoreSynchronizeOperation.java  |  27 +
 .../ui/subscriber/UpdateSynchronizeOperation.java  |  10 +-
 .../ui/svnproperties/SvnPropertiesView.java        |  13 +-
 .../subclipse/ui/util/DetailsDialog.java           |   4 +-
 .../subclipse/ui/util/ResourceSelectionTree.java   |  17 +
 .../subclipse/ui/wizards/BranchTagWizard.java      |   2 +-
 .../ui/wizards/BranchTagWizardRepositoryPage.java  |  17 +-
 .../subclipse/ui/wizards/CheckoutWizard.java       |  70 ++-
 .../ui/wizards/CheckoutWizardLocationPage.java     |   4 +
 .../subclipse/ui/wizards/ClosableWizardDialog.java |   5 +
 .../subclipse/ui/wizards/CloudForgeComposite.java  |  49 ++
 .../ui/wizards/ConfigurationWizardMainPage.java    |  39 +-
 ...gurationWizardRepositorySourceProviderPage.java | 165 ++++++
 .../subclipse/ui/wizards/NewLocationWizard.java    |  64 ++-
 .../ui/wizards/ReplaceWithBranchTagWizard.java     |  87 ++++
 .../ReplaceWithBranchTagWizardMainPage.java        | 324 ++++++++++++
 .../wizards/SVNRepositoryProviderWizardPage.java   |  33 ++
 .../dialogs/SvnWizardNewRepositoryPage.java        |   6 +
 .../ui/wizards/dialogs/SvnWizardSwitchPage.java    | 302 ++++++-----
 .../ui/wizards/dialogs/SvnWizardUpdatePage.java    |  34 +-
 .../wizards/sharing/RepositorySelectionPage.java   |  44 +-
 .../ui/wizards/sharing/SharingWizard.java          | 134 +++--
 .../site.xml                                       |  10 +-
 125 files changed, 3160 insertions(+), 1407 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-subclipse.git



More information about the pkg-java-commits mailing list