ngraham added a comment.
I'm afraid your patch does not apply for me:
$ arc patch D21192
INFO Base commit is not in local repository; trying to fetch.
Created and checked out branch arcpatch-D21192.
Checking patch lookandfeel/contents/lockscreen/MainBlock.qml...
error: while searching for:
focus: true
echoMode: TextInput.Password
inputMethodHints: Qt.ImhHiddenText | Qt.ImhSensitiveData |
Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
enabled: !authenticator.graceLocked
revealPasswordButtonShown: true
onAccepted: {
error: patch failed: lookandfeel/contents/lockscreen/MainBlock.qml:59
error: while searching for:
PlasmaComponents.Button {
id: loginButton
Layout.fillWidth: true
text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Unlock")
onClicked: startLogin()
error: patch failed: lookandfeel/contents/lockscreen/MainBlock.qml:93
Checking patch lookandfeel/contents/lockscreen/LockScreenUi.qml...
Hunk #1 succeeded at 40 (offset 4 lines).
Applying patch lookandfeel/contents/lockscreen/MainBlock.qml with 2
rejects...
Rejected hunk #1.
Rejected hunk #2.
Applied patch lookandfeel/contents/lockscreen/LockScreenUi.qml cleanly.
Patch Failed!
Usage Exception: Unable to apply patch!
Did you work against git master, or the version that was on your machine? If
the latter, you need to work on git master if you're going to submit a patch
that will be applied against git master. :)
REPOSITORY
R120 Plasma Workspace
REVISION DETAIL
https://phabricator.kde.org/D21192
To: siddharthasahu, ngraham, #plasma, #vdg
Cc: plasma-devel, jraleigh, GB_2, ragreen, Pitel, ZrenBot, lesliezhai,
ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
