MR for Bug 303: "Menu -> Edit -> cut/copy/paste does not work for location entry"
Merge request reports
Activity
mentioned in issue #303 (closed)
So I'm just starting having a look at this - I have not got to looking at the code yet but I have a comment on how you have done the merge request.
So I think it is considered best not to work directly on the
master
branch. Instead, you should create a new branch offmaster
, egbugfix-branch
, do your work on that, and then submit a merge request to mergebugfix-branch
into the thunarmaster
branch. If themaster
branch gets updated with new commits while your MR is pending, you then rebasebugfix-branch
onto the newmaster
(gitlab usually provides a button in the web interface to the MR for this). This way, whenbugfix-branch
does get merged into the main thunar repository, the commit history will be nice and linear and thus easier to understand.It looks like you've done a merge (maybe via
git pull
?) to merge the latest commits from the main thunar repository'smaster
branch into your merge request. The result is that you have a merge commit in your MR, and if it were to be merged intomaster
like that, this merge commit would end up in the main repository's history and make it unnecessarily complicated.Thus I think you should probably re-submit this merge request on a separate branch. On the other hand, I'm not massively experienced with git/gitlab myself, so maybe I have said something wrong!
I'll try to have a look at your code soon. Thanks!
Edited by Reuben Green- Resolved by DarkTrick
- Resolved by DarkTrick
- Resolved by DarkTrick
- Resolved by DarkTrick
- Resolved by DarkTrick
So I've given this a quick test and it seems to work well - nice!
I've added a few suggestions and comments, I hope they are helpful.
One point about design - are the new functions in
thunar-gtk-extensions
really needed? They are all just one-liners, so maybe it would be better to just call the underlying functions directly?Anyway, I hope this all helps. Thanks!
Edited by Reuben Green
- Resolved by DarkTrick
- Resolved by DarkTrick
- Resolved by DarkTrick
- Resolved by DarkTrick
mentioned in merge request libxfce4ui!6 (closed)
mentioned in merge request !21 (closed)