使用Mercurial补丁的“应用过程中的错误,请修复并刷新”

时间:2018-10-22 20:39:07

标签: ubuntu mercurial gem5

在将nvmain补丁应用于gem5目录时遇到错误:

$ hg qpush
applying nvmain2-gem5-11688+
patch failed, unable to continue (try -v)
patch failed, rejects left in working directory
errors during apply, please fix and qrefresh nvmain2-gem5-11688+

我尝试删除修补程序以对其进行更新并重新应用,但是在应用时遇到了相同的错误:

$ hg qpop -a
popping nvmain2-gem5-11688+
patch queue now empty

$ hg qimport -f ~/nvmain/patches/gem5/nvmain2-gem5-11688+
adding nvmain2-gem5-11688+ to series file

0 个答案:

没有答案