Allow folder view elements to be be dropped using other Action than Copy
ClosedPublic

Authored by meven on Apr 27 2019, 11:08 AM.

Diff Detail

Repository
R119 Plasma Desktop
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
meven created this revision.Apr 27 2019, 11:08 AM
Restricted Application added a project: Plasma. · View Herald TranscriptApr 27 2019, 11:08 AM
Restricted Application added a subscriber: plasma-devel. · View Herald Transcript
meven requested review of this revision.Apr 27 2019, 11:08 AM
ngraham accepted this revision.Apr 29 2019, 5:02 PM
ngraham added a reviewer: hein.
ngraham added a subscriber: hein.

@hein is this okay?

This revision is now accepted and ready to land.Apr 29 2019, 5:02 PM
hein accepted this revision.May 5 2019, 4:17 PM

Please land this on the stable branch (Plasma/5.15) before tagging in two days, then merge to master. See https://community.kde.org/Infrastructure/Phabricator#Landing_on_the_.22Stable_branch.22

If you need help, don't hesitate to let me know!

This revision was automatically updated to reflect the committed changes.

Now don't forget to merge to master. :)

git checkout Plasma/5.15
git pull
git checkout master
git merge -s recursive -Xours origin/Plasma/5.15
git push

I have a handy shell function kmerge that does this for me and then checks the result:

function kmerge {
    # Make sure the merge branch is up to date
    CURRENTBRANCH=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'`
    git checkout $1
    git pull

    # Do the merge safely
    git checkout $CURRENTBRANCH
    git merge -s recursive -Xours $1

    # Verify it afterwards
    git diff origin/HEAD HEAD

    # Now push!
}
meven added a comment.May 6 2019, 1:24 AM

Now don't forget to merge to master. :)

git checkout Plasma/5.15
git pull
git checkout master
git merge -s recursive -Xours origin/Plasma/5.15
git push

I have a handy shell function kmerge that does this for me and then checks the result:

function kmerge {
    # Make sure the merge branch is up to date
    CURRENTBRANCH=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'`
    git checkout $1
    git pull

    # Do the merge safely
    git checkout $CURRENTBRANCH
    git merge -s recursive -Xours $1

    # Verify it afterwards
    git diff origin/HEAD HEAD

    # Now push!
}

Done thanks

I am always worried to merge others people work.

ngraham added a comment.EditedMay 6 2019, 1:42 AM

Me too, it's a bit unnerving the first few times you do it! You did great, BTW.