[wtp-dev] eGit merge can cause issues (was [wtp-releng] WTP adoption of

[Carl Anderson <ccc@xxxxxxxxxx>]

Folks,

I wanted to share what happened here, since this may hit others using eGit while developing WTP.  Simply put, I made changes to our dependencies.properties file to move the WTP 3.5 build up to a newer Eclipse platform and DTP.  Since this prevented us from building, I went in to revert the changes.  I did a history of the file, and did a Compare with Working Tree.  As meticulous as I am, I used the Next Change button to go through each change and then used the Copy Current Change from Right to Left button on each change.  Once I had reverted all of the changes, I saved, and then did another Compare with Working Tree (I told you I was meticulous) to ensure that there were no other changes.  The files appeared identical.  So I committed and pushed the change, and the build blew up.
It took me quite a bit of searching to find the whitespace difference that was causing the issue.  And even after I had fixed it by hand, eGit wouldn't let me commit the file, since it still stated that nothing had changed.  There's probably some setting in there that I can change that will force eGit to recognize the whitespace-only change, but I ended up just making another non-whitespace change and then I was able to commit and push the file, and the builds started working again.
Anyway, I just wanted to give everyone a heads up of what happened to me, since I never had issues like this with CVS, and since it might happen to another WTP developer at some point.

FWIW,

- Carl Anderson
WTP programmer
----- Forwarded by Carl Anderson/Raleigh/IBM on 12/05/2012 11:47 AM -----

From:	Carl Anderson/Raleigh/IBM@IBMUS
To:	Webtools releng discussion list <wtp-releng@xxxxxxxxxxx>
Date:	12/03/2012 03:40 PM
Subject:	[wtp-releng] WTP adoption of new ICU blocked by DTP
Sent by:	wtp-releng-bounces@xxxxxxxxxxx

---

Folks,

I did a search through our MANIFEST.MF files, and I do not see any that have an explicit requirement of a version range for ICU- all of the ones that I saw were similar to:

com.ibm.icu;bundle-version="3.8.1",

I tried to move the WTP build up to the latest Eclipse 4.3 integration drivers, which include the new ICU.  Unfortunately, DTP has not fixed their ICU dependencies.  They have opened https://bugs.eclipse.org/bugs/show_bug.cgi?id=395346 to address this issue.  Once that bug is resolved, I will attempt to verify that we do not have any ICU versioning issues.

FWIW,

- Carl Anderson
WTP Build guy_______________________________________________
wtp-releng mailing list
wtp-releng@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/wtp-releng