Question

每当我尝试从文件夹中复制文件时，进行一些更改并对其进行修补，它总是试图修补新文件。为什么呢？

$ mkdir test
$ vim test/1 (Write something)
$ cp test/1 ./1
$ vim 1 (Do some change)
$ diff -Naur test/1 1 > patch
$ patch -p0 < patch
   pathing file 1
   Reversed (or previously applied) patch detected!  Assume -R? [n]

Answer 1

仔细阅读 patch(1)和diff(1)。

void MyClient::process(){ //typical connection things connect(this->socket, SIGNAL(encrypted()), this, SLOT(ready())); } void MyClient::ready(){ connect(socket,SIGNAL(readyRead()),this, SLOT(newData())); }在当前工作目录中工作（默认情况下）。但是你可以在其他目录上调用patch（补丁）。尝试diff，它可以更好地工作。 diff -Naur 1 test/1 > patch的参数顺序非常重要！

差异和补丁没有按预期工作

1 个答案: