Dima Pasechnik <[email protected]> writes: > On Friday, 20 July 2012 19:24:26 UTC+8, Ben Hutz wrote: > > It was created with hg export. I just copied out the portion for > the relevant file to post (the whole patch is on trac #13120). I > thought from Volker's comment that the "diff ..." was the > metadata. Based on your comment, that seems to not be the case. > What portion of the patch is the "metadata" that it is having > trouble syncing and what is it syncing with? > > metadata makes it possible store the right history context. > What comes after "diff --git" is not relevant, AFAIK.
Actually if you look at the code which produces this error message [1], it is definitely looking for stuff after a line beginning with "diff --git". "metadata" in this context refers to the information added by git diff format's extension of the standard unified diff format, which includes such things as notices that a file is being renamed, copied, etc. The metadata you are referring to is called "patch headers" in Mercurial, apparently. Ben, can you post the entire patch file? Looking at your mail, I notice that the filenames on the line beginning with "diff --git" are wrapped into the next line. If that's the case in the original patch file as well, that might be causing the error. On the other hand, it's quite likely that the word wrapping was done by your mail program. Another possibility is line ending mismatches. Anyway, a good first step in troubleshooting would be to ask your correspondent to md5sum their file, and compare the hash with that of your own patch, just in case. [1] http://selenic.com/hg/file/436cc9d017c6/mercurial/patch.py#l1234 -Keshav ---- Join us in #sagemath on irc.freenode.net ! -- -- To post to this group, send an email to [email protected] To unsubscribe from this group, send an email to [email protected] For more options, visit this group at http://groups.google.com/group/sage-devel URL: http://www.sagemath.org
