D23392: [energy KCM] Add battery Technology

Nathaniel Graham noreply at phabricator.kde.org
Mon Sep 2 01:16:24 BST 2019


ngraham added a comment.


  Needs a rebase as it no longer applies cleanly:
  
    $ arc patch D23392
     INFO  Base commit is not in local repository; trying to fetch.
    Created and checked out branch arcpatch-D23392.
    Branch name arcpatch-D23152 already exists; trying a new name.
    Created and checked out branch arcpatch-D23152_1.
    Checking patch Modules/energy/package/contents/ui/main.qml...
    Checking patch Modules/energy/batterymodel.h...
    Checking patch Modules/energy/batterymodel.cpp...
    Applied patch Modules/energy/package/contents/ui/main.qml cleanly.
    Applied patch Modules/energy/batterymodel.h cleanly.
    Applied patch Modules/energy/batterymodel.cpp cleanly.
    
     Cherry Pick Failed!
     Exception 
    Command failed with error #1!
    COMMAND
    git cherry-pick 'arcpatch-D23152_1'
    
    STDOUT
    (empty)
    
    STDERR
    error: could not apply 84aed6f... [energy kcm] Display Vendor and model
    hint: after resolving the conflicts, mark the corrected paths
    hint: with 'git add <paths>' or 'git rm <paths>'
    hint: and commit the result with 'git commit'
    
    (Run with `--trace` for a full exception trace.)

REPOSITORY
  R102 KInfoCenter

REVISION DETAIL
  https://phabricator.kde.org/D23392

To: meven, broulik, ngraham
Cc: plasma-devel, LeGast00n, The-Feren-OS-Dev, jraleigh, fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20190902/6d90dcb6/attachment-0001.html>


More information about the Plasma-devel mailing list