Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 351720

Summary:	R4_development branch of org.eclipse.ui.workbench has files from the original 3.x bundle
Product:	[Eclipse Project] Platform	Reporter:	Remy Suen <remy.suen>
Component:	UI	Assignee:	Paul Webster <pwebster>
Status:	RESOLVED FIXED	QA Contact:
Severity:	critical
Priority:	P3	CC:	daniel_megert
Version:	4.1
Target Milestone:	4.1.1
Hardware:	All
OS:	All
Whiteboard:

Description Remy Suen

2011-07-11 10:47:13 EDT

When I cloned the R4_development branch I got deleted files like ViewPane and BasicPartList. It looks like the repository isn't correct.

Comment 1 Paul Webster

2011-07-11 13:03:10 EDT

pushed commit 3462407870b4ea143fc4972b2a35c3625be01998

PW

Comment 2 Dani Megert

2011-07-12 03:43:53 EDT

Why did you end up with those? Is there something other teams must look for when doing the migration?

Comment 3 Paul Webster

2011-07-12 08:33:11 EDT

(In reply to comment #2)
> Why did you end up with those?

This was because of the completely separate fork we did of org.eclipse.ui.workbench.  When I merged the fork  into R4_development, the outcome was supposed to be the contents of the fork existing in R4_development.  The command to do that is:
git checkout --theirs bundles/org.eclipse.ui.workbench

But because I'm stitching together 2 converted CVS repos, that command correctly selected all of the new fork files and all of the common fork files, but didn't remove any of the old files (I had to make a different commit to remove them).

> Is there something other teams must look for
> when doing the migration?

If another team was stitching together multiple repos and needed to take the entire project from the other branch, the better way would be:

git rm bundles/org.eclipse.ui.workbench
git checkout --theirs bundles/org.eclipse.ui.workbench

The git rm will guarantee the old files are gone.

PW