0

I am working on a unix machine & I did a diff on my old sandbox:

svn diff -x -w . > ~todays.diff

and applied the patch on a new sandbox:

patch -p0 -i ~todays.diff

but I am getting these errors:

Hmm... The next patch looks like a unified diff to me...

The text leading up to this was:

patch: **** misordered hunks! output would be garbled

What am I doing wrong here?

4

1 回答 1

1
  1. 不要使用操作系统patch从 应用补丁svn diff,你有svn patch(解决过程中的合并冲突,如果它们会出现)
  2. 如果两个 WC 都绑定到同一个 repo,为什么你不想使用“commit”-“update”过程?
于 2013-07-23T19:09:57.720 回答