Review Request 120216: Add "open-with" action and right-click context menu to Ark
Raphael Kubo da Costa
rakuco at FreeBSD.org
Thu Oct 23 18:24:23 UTC 2014
> On Oct. 23, 2014, 8:06 p.m., Raphael Kubo da Costa wrote:
> > Erm, since this implements a new feature and adds new strings, you should have committed it to master, not KDE/4.14.
>
> Elvis Angelaccio wrote:
> Ouch, I'm sorry. Should I try to revert it from KDE/4.14?
>
> Elvis Angelaccio wrote:
> In particular, I think these commands should do the work:
>
> to remove the commit from the remote KDE/4.14 branch:
> - `git reset --hard HEAD~1` # on my local KDE/4.14 branch
> - `git push --force origin KDE/4.14`
>
> to revert the merge and reset origin master to its previous commit:
> - `git revert -m 1 fe127a1df3a57eb9abf7ac190387b0cb485548fa`
>
> and finally commit to master as if this mistake never happened.
> Let me know if I'm missing something.
Sorry, I got dragged into something else here.
This approach doesn't work because force-pushes are never supposed to happen in KDE's public repositories.
Instead, I'm considering something less esoteric:
```
git checkout KDE/4.14
git revert HEAD
# explain why it's being reverted, commit with CCBUG: 179066
git checkout master
git merge --log --edit --no-ff --strategy ours
# commit explaining that --strategy ours was used and thus the revert was not integrated into master
```
I haven't tested it if works, but it should. Don't worry, I can handle it here.
- Raphael
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/120216/#review69033
-----------------------------------------------------------
On Oct. 23, 2014, 7:48 p.m., Elvis Angelaccio wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/120216/
> -----------------------------------------------------------
>
> (Updated Oct. 23, 2014, 7:48 p.m.)
>
>
> Review request for KDE Utils and Raphael Kubo da Costa.
>
>
> Bugs: 179066
> http://bugs.kde.org/show_bug.cgi?id=179066
>
>
> Repository: ark
>
>
> Description
> -------
>
> This review aims to bring life to this 2 years-old review: https://git.reviewboard.kde.org/r/103690/
> The patch is mostly the same, but the issues pointed by Raphael should now be fixed.
> In particular, the default Ark behavior is unchanged: when an entry is double clicked, the preview is showed (instead of launching the default application of that entry).
>
>
> Diffs
> -----
>
> part/ark_part.rc 044c11a562d03589314f05e86eb1d68e633ee35e
> part/part.h 5379b9fc1aaa4ce451c8b1745ca46ee78630b005
> part/part.cpp 09fe1cbfcc7f4345fe12932055dcb041f50abb7b
>
> Diff: https://git.reviewboard.kde.org/r/120216/diff/
>
>
> Testing
> -------
>
> Open an existing archive, right-click on an entry, the context menu is showed and and the "Open With..." action is available.
>
>
> Thanks,
>
> Elvis Angelaccio
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-utils-devel/attachments/20141023/a4e9a1cb/attachment.html>
More information about the Kde-utils-devel
mailing list