Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add resource filters to parent projects #699

Closed
wimjongman opened this issue Nov 10, 2021 · 5 comments · Fixed by #702
Closed

Add resource filters to parent projects #699

wimjongman opened this issue Nov 10, 2021 · 5 comments · Fixed by #702
Milestone
4.9

Comments

@wimjongman
Copy link
Contributor

In BIRT there are several parent projects which cause projects to be seen by eclipse at multiple levels. This is causing freezes and a general confusion inside Eclipse.
@wimjongman wimjongman added this to the 4.9 milestone Nov 10, 2021
@wimjongman wimjongman mentioned this issue Nov 10, 2021
Closed
@merks
Copy link
Contributor

merks commented Nov 10, 2021

@wimjongman

I looked at your video and understand how to create a fork. But please excuse my ignorance. What's not clear is how work with that in Eclipse. I found this question with a description:

https://stackoverflow.com/questions/53024406/how-to-work-on-a-project-fork-when-having-the-original-in-eclipse

So I think I could follow those instructions (add a remote to pushes to my fork URI) but is this really the simplest/correct approach?

My concern is that I make a bunch of changes, commit them to my fork, but maybe I forget something and then I have multiple commits. Will multiple commits be a problem?

Also, what happens if someone commits other changes after I have forked? How can I rebase my fork/branch if that happens?

Again, sorry if these are stupid questions...

@wimjongman
Copy link
Contributor Author

Again, sorry if these are stupid questions...

After all these years of learning from you, I'm happy to return the favor. :)

but is this really the simplest/correct approach?

Yes, after you have already cloned the main repo, this is the easiest approach. Detailed steps are:

If you did not already clone the master birt repo then you should just clone your fork:

Will multiple commits be a problem?

Just make sure you put all your commits in a topic branch and you can push as many commits as you like. After you made a pull request, even pushes after that will be automatically added to the pull request.

We can squash before we do the final merge.

what happens if someone commits other changes after I have forked

The easiest way is to go to your fork on the GitHub website and rebase your forked repository. Then fetch and merge/rebase locally.

image

@merks merks mentioned this issue Nov 10, 2021
Merged
@merks
Copy link
Contributor

merks commented Nov 10, 2021

Thank you! That wasn't so hard!!

I created this pull request to test the process before adding filters to the various projects with nested projects.

#700

merks added a commit to merks/birt that referenced this issue Nov 11, 2021
@merks
Add resource filters to parent projects eclipse-birt#699
23174d8 
In general, for projects that contain nested projects, filter the
folders corresponding to such nested projects such that the nested
contents of those folders are not shown in the resource tree, although
the folder itself is shown.  Of course when the nested contents are not
in the resource tree, they are not shown in any explorers.

Note that this filtering is designed not to apply for folders starting
with a '.', e.g,. .settings folders.  These folders are hidden by
default in the explorers anyway but need must be present in order to
store project-specific preferences.
@merks
Copy link
Contributor

merks commented Nov 11, 2021

I created this pull request for this issue:

#702

Here's how it looks:

image

Note that the .github and .settings folders show nested contents but the rest of the folders do not show nested contents; I turned off the filter that hides .* resources in this view.

wimjongman pushed a commit that referenced this issue Nov 11, 2021
@merks
Add resource filters to parent projects #699 (#702)
2895d5d 
In general, for projects that contain nested projects, filter the
folders corresponding to such nested projects such that the nested
contents of those folders are not shown in the resource tree, although
the folder itself is shown.  Of course when the nested contents are not
in the resource tree, they are not shown in any explorers.

Note that this filtering is designed not to apply for folders starting
with a '.', e.g,. .settings folders.  These folders are hidden by
default in the explorers anyway but need must be present in order to
store project-specific preferences.
@wimjongman wimjongman linked a pull request Nov 11, 2021 that will close this issue
Add resource filters to parent projects #699 #702
Merged
wimjongman added a commit to wimjongman/birt that referenced this issue Nov 11, 2021
@wimjongman
Add resource filters to parent projects eclipse-birt#699
0685e38 
Added some java documentation
@wimjongman
Copy link
Contributor Author

Verified. Thank you, Ed.

@merks merks mentioned this issue Oct 2, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
4.9
Development

Successfully merging a pull request may close this issue.

Add resource filters to parent projects #699 merks/birt
2 participants
@wimjongman @merks