Skip to content
Snippets Groups Projects

MR for Bug 303: "Menu -> Edit -> cut/copy/paste does not work for location entry"

Closed DarkTrick requested to merge DarkTrick/thunar:master into master
All threads resolved!

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • DarkTrick mentioned in issue #303 (closed)

    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 off master, eg bugfix-branch, do your work on that, and then submit a merge request to merge bugfix-branch into the thunar master branch. If the master branch gets updated with new commits while your MR is pending, you then rebase bugfix-branch onto the new master (gitlab usually provides a button in the web interface to the MR for this). This way, when bugfix-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's master branch into your merge request. The result is that you have a merge commit in your MR, and if it were to be merged into master 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
  • Reuben Green
  • Reuben Green
  • Reuben Green
  • Reuben Green
    • 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
  • Alexander Schwinn
  • Alexander Schwinn
  • Alexander Schwinn
  • Well done, works nicely for me, looking forward to get it merged !

  • DarkTrick
  • DarkTrick mentioned in merge request libxfce4ui!6 (closed)

    mentioned in merge request libxfce4ui!6 (closed)

  • DarkTrick resolved all threads

    resolved all threads

  • closed

  • DarkTrick mentioned in merge request !21 (closed)

    mentioned in merge request !21 (closed)

  • Please register or sign in to reply
    Loading