Skip to content

Conversation

@wahlbrink
Copy link
Contributor

Fixes encoding of the contents for 'compare with clipboard' if default encoding (of workspace) is not UTF-8.

Before (workspace default is set to CP-1252):
before

Fixed:
after

@eclipse-platform-bot
Copy link
Contributor

This pull request changes some projects for the first time in this development cycle.
Therefore the following files need a version increment:

team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF

An additional commit containing all the necessary changes was pushed to the top of this PR's branch. To obtain these changes (for example if you want to push more changes) either fetch from your fork or apply the git patch.

Git patch
From a77f7d250d78d922bb13a90b449802455b894a1e Mon Sep 17 00:00:00 2001
From: Eclipse Platform Bot <platform-bot@eclipse.org>
Date: Wed, 10 Dec 2025 14:02:27 +0000
Subject: [PATCH] Version bump(s) for 4.39 stream


diff --git a/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF b/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF
index e30174cbcc..83b13f0a7b 100644
--- a/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF
+++ b/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.compare; singleton:=true
-Bundle-Version: 3.11.600.qualifier
+Bundle-Version: 3.11.700.qualifier
 Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-- 
2.52.0

Further information are available in Common Build Issues - Missing version increments.

@github-actions
Copy link
Contributor

Test Results

 1 953 files  ±0   1 953 suites  ±0   1h 20m 8s ⏱️ - 10m 54s
 4 744 tests ±0   4 720 ✅ ±0   24 💤 ±0  0 ❌ ±0 
14 232 runs  ±0  14 050 ✅ ±0  182 💤 ±0  0 ❌ ±0 

Results for commit cb4a4f7. ± Comparison against base commit 2cd05a8.

Copy link
Contributor

@SougandhS SougandhS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@SougandhS
Copy link
Contributor

Hi @vogella, could you please merge this PR ?

@laeubi laeubi merged commit 72cce17 into eclipse-platform:master Dec 11, 2025
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants