Bug 581290 - Switch with rebase option?
Summary: Switch with rebase option?
Status: NEW
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: PC Linux
: P3 enhancement (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-01-06 03:16 EST by Christoph Laeubrich CLA
Modified: 2023-01-06 04:21 EST (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Christoph Laeubrich CLA 2023-01-06 03:16:34 EST
When working on feature branches, they sometimes lingering around (e.g. because require other work to be finished first or because some discussion is required) and in the meanwhile the base branch has diverged.

Because of this I often then do:
- fetch changes from the base (e.g. master/main)
- switch to the feature-branch sometimes later
- perform rebase for base branch

This obviously works, but has some undesired side-effect:
If base + feature has different files/projects, there is a lot of "noise" in the workspace, e.g. lets say a project was added the following happens:

- on the master/main the project is there and it is open in the workspace
- switching to the feature branch closes the project and eclipse complains it is gone
- after the rebase it is there again, but remains closed

Similar things happen when a file is open in the editor that is (not yet) available on the feature branch, this also triggers a lot of rebuilds.

I think it would therefore be good if there would be some kind of "switch and rebase" option where I can combine both actions an egit in the meanwhile suppress updates to the workspace (disable autobuild or execute in a workspace change job?).
Comment 1 Hannes Wellmann CLA 2023-01-06 04:21:50 EST
I second that, this feature would be very helpful. Especially with feature branches that are left behind for some time and if greater changes happened in the repo this back in forth can be quite time consuming.
Don't know if this is possible to achieve with bare-metal git. But actually the changes on files from the base (not touched by the feature) would then not be necessary at all (from a result point of view).

> I think it would therefore be good if there would be some kind of "switch and rebase" option where I can combine both actions an egit in the meanwhile suppress updates to the workspace (disable autobuild or execute in a workspace change job?).

That would be good for this, but also in general for rebase. I have at least the impression that building is not suppressed while a rebase (without conflict interruptions) is going on and on Windows where refresh happens automatically through native hooks this can make the IDE quite nervous/busy.