D10990: Add "Open symlink destination folder" into symlink's context menu
Roman Inflianskas
noreply at phabricator.kde.org
Tue Mar 6 16:00:44 GMT 2018
rominf added a comment.
In D10990#219907 <https://phabricator.kde.org/D10990#219907>, @ngraham wrote:
> The patch no longer applies for me on master
>
> Created and checked out branch arcpatch-D10990.
>
>
> This diff is against commit 48b58f830a585b773435c9af5ee2fe8f0c7c641d, but
> the commit is nowhere in the working copy. Try to apply it against the
> current working copy state? (436ad965e93409e2225b3d0451e997fb655b3e87)
> [Y/n] y
>
> Checking patch src/dolphinmainwindow.cpp...
> error: while searching for:
> #include <KFilePlacesModel>
> #include <KHelpMenu>
> #include <KIO/JobUiDelegate>
> #include <KJobWidgets>
> #include <KLocalizedString>
> #include <KMessageBox>
>
> error: patch failed: src/dolphinmainwindow.cpp:51
> Hunk #2 succeeded at 1213 (offset -2 lines).
> Checking patch src/dolphincontextmenu.cpp...
> Hunk #1 succeeded at 195 (offset 3 lines).
> Hunk #2 succeeded at 312 (offset 3 lines).
> Applying patch src/dolphinmainwindow.cpp with 1 reject...
> Rejected hunk #1.
> Hunk #2 applied cleanly.
> Applied patch src/dolphincontextmenu.cpp cleanly.
>
> Patch Failed!
> Usage Exception: Unable to apply patch!
>
It works fine for me:
$ arc patch D10990
Created and checked out branch arcpatch-D10990.
Checking patch src/dolphinmainwindow.cpp...
Checking patch src/dolphincontextmenu.cpp...
Applied patch src/dolphinmainwindow.cpp cleanly.
Applied patch src/dolphincontextmenu.cpp cleanly.
OKAY Successfully committed patch.
REPOSITORY
R318 Dolphin
REVISION DETAIL
https://phabricator.kde.org/D10990
To: rominf, #dolphin, ngraham
Cc: ngraham, elvisangelaccio, markg, #dolphin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mail.kde.org/mailman/private/kfm-devel/attachments/20180306/9dd9dd88/attachment.htm>
More information about the kfm-devel
mailing list