CODEWITHSUNDEEP
svnunix
brokenfoot
brokenfoot

Reputation: 11649

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

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?

Upvotes: 1

Views: 922

Answers (1)

Lazy Badger
Lazy Badger

Reputation: 97345

  1. Don't use OS patch for applying patch from svn diff, you have svn patch (with resolving merge-conflicts in process, if they will appear)
  2. If both WCs are binded to the same repo, why you don't want to use "commit"-"update" procedure?

Upvotes: 1

Related Questions