Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 351720 - R4_development branch of org.eclipse.ui.workbench has files from the original 3.x bundle
Summary: R4_development branch of org.eclipse.ui.workbench has files from the original...
Status: RESOLVED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: UI (show other bugs)
Version: 4.1   Edit
Hardware: All All
: P3 critical (vote)
Target Milestone: 4.1.1   Edit
Assignee: Paul Webster CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-07-11 10:47 EDT by Remy Suen CLA
Modified: 2011-07-12 08:33 EDT (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Remy Suen CLA 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 CLA 2011-07-11 13:03:10 EDT 
pushed commit 3462407870b4ea143fc4972b2a35c3625be01998

PW
Comment 2 Dani Megert CLA 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 CLA 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