zoukankan      html  css  js  c++  java
  • git apply -v 提示 Skipped patch 打不上patch的解决办法

    git apply -v  33ae302.diff 提示 Skipped patch 'custom/mtk/mtk/packages/apps/LiveTV/src/com/mediatek/wwtv/tvcenter/nav/TurnkeyUiMainActivity.java'.

    但是目录和文件命名没有改动,怎么打不上去呢

    vi   33ae302.diff

    diff --git a/custom/mtk/mtk/packages/apps/LiveTV/src/com/mediatek/wwtv/tvcenter/nav/Tu
    rnkeyUiMainActivity.java b/custom/mtk/mtk/packages/apps/LiveTV/src/com/mediatek/wwtv/t
    vcenter/nav/TurnkeyUiMainActivity.java
    index be39f17..b3c8ed4 100644
    --- a/custom/mtk/mtk/packages/apps/LiveTV/src/com/mediatek/wwtv/tvcenter/nav/TurnkeyUi
    MainActivity.java
    +++ b/custom/mtk/mtk/packages/apps/LiveTV/src/com/mediatek/wwtv/tvcenter/nav/TurnkeyUi
    MainActivity.java


    可见目录是

    /custom/mtk/mtk/packages/apps/LiveTV/src/com/mediatek/wwtv/tvcenter/nav/Tu
    rnkeyUiMainActivity.java b/custom/mtk/mtk/packages/apps/LiveTV/src/com/mediatek/wwtv/t
    vcenter/nav/TurnkeyUiMainActivity.java


    而仓库的目录是android/n-cn/vendor/mediatek/open//custom/mtk/mtk/packages/apps/LiveTV/src/com/mediatek/wwtv/tvcenter/nav/Tu
    rnkeyUiMainActivity.java b/custom/mtk/mtk/packages/apps/LiveTV/src/com/mediatek/wwtv/t
    vcenter/nav/TurnkeyUiMainActivity.java


    所以

    git apply --directory android/n-cn/vendor/mediatek/open 33ae302.diff

    关于 –directory 的解释可以查看git apply –h

    --directory <root>    prepend <root> to all filenames

    因为别人生成的patch目录不完整,所以我们要让patch加上目录前缀--directory android/n-cn/vendor/mediatek/open

  • 相关阅读:
    二 web爬虫,scrapy模块以及相关依赖模块安装
    一 web爬虫,requests请求
    Linux 常用命令大全
    HTTP响应状态码参考
    python-进程,线程,协程
    SVN图形管理工具-Submint
    python-Socket网络编程
    python基础-pickle与shelve
    python-面向对象
    10分钟看懂, Java NIO 底层原理
  • 原文地址:https://www.cnblogs.com/DaSunWarman/p/7808952.html
Copyright © 2011-2022 走看看