Bug 359032

Comment 1 Tomasz Zarna 2011-09-30 12:01:01 EDT

A temporary entry in .gitignore "/*/*/*/*/bin/" should be also removed at the same time (see bug 355509, comment 41).

Comment 2 Dani Megert 2011-10-01 04:26:49 EDT

I see this is scheduled for M4. You do know that reordering the folders destroys the workspace of everyone who has cloned the team repo and checked out projects from it?

You should either do this right now and then let people use the repo again or close this bug and leave the repo as is.

Comment 3 Tomasz Zarna 2011-10-07 06:31:52 EDT

Do you guys think I should leave a readme file in each project under bundles/org.eclipse.compare/plugins/ saying that it has been moved to a different location? I would just sweep the bundles/org.eclipse.compare/plugins/ folder and send a note to eclipse-team-dev and eclipse-releng.

Comment 4 Dani Megert 2011-10-07 06:56:48 EDT

(In reply to comment #3)
> Do you guys think I should leave a readme file in each project under
> bundles/org.eclipse.compare/plugins/ saying that it has been moved to a
> different location? I would just sweep the bundles/org.eclipse.compare/plugins/
> folder and send a note to eclipse-team-dev and eclipse-releng.

You should first send a note that and when you are going to do it, so that people have time to push their changes to the repo. Also, I suspect that local/private branches might get corrupted by this change.

Comment 5 Tomasz Zarna 2011-10-07 09:37:43 EDT

(In reply to comment #4)
> Also, I suspect that local/private branches might get corrupted by this change.

I will check that.

Comment 6 Tomasz Zarna 2011-10-12 12:03:17 EDT

Created attachment 205044 [details]
script moving the plugins

> (In reply to comment #4)
> I suspect that local/private branches might get corrupted by this change.

I'm afraid you were right about that. I had created a local branch with some dummy changes, then switched back to master and moved the plugins to the planned location. After re-importing them in Eclipse everything looked fine. Unfortunately, I found no way (maybe didin't try hard enough) to merge the previously created branch without getting a bunch of conflicts. However, in CGit, I managed to rebase the dummy branch, applying changes to the branch with moved plugins. To be honest, I was quite surprised it worked. The bad news is that doing the same in EGit failed with a message about not able to cherry-pick a commit with two parents.

Dani, have you already created local branches in your clone? If no, I would proceed with the move.

Comment 7 Tomasz Zarna 2011-10-12 12:07:02 EDT

(In reply to comment #6)
>  I managed to rebase the dummy branch, applying changes to the branch with
> moved plugins.

This worked only for a repo cloned over git, doing the same steps for http resulted in a message saying that "patch does not have a valid e-mail address". In the latter rebasing failed.

Comment 8 Dani Megert 2011-10-13 05:54:09 EDT

> Dani, have you already created local branches in your clone? If no, I would
> proceed with the move.

I've secured that work. You can go ahead.

Comment 9 Tomasz Zarna 2011-10-13 07:47:58 EDT

(In reply to comment #0)
> Don't forget to update the map file when done.

I'm going to update the map right now for the sake of n-builds. As for the next i-build, I'm guessing that the compare plugins need to tagged as well, no matter if they contain any changes or not.

Comment 10 Tomasz Zarna 2011-10-13 07:53:08 EDT

It's done, f0e53ee2640b02d1f95f87dfcfa88331c3336845.

Dani, Szymon, Gosia please pull the change and re-import the compare projects into your workspace.

Comment 11 Dani Megert 2011-10-14 03:43:47 EDT

> Dani, Szymon, Gosia please pull the change and re-import the compare projects
> into your workspace.

I've updated my workspaces.