On Wed, 13 Mar 2002, Ylan Segal <[EMAIL PROTECTED]> wrote: > What is the Unified diff format? I use jCVS as my cvs client and > used "show diffs" on the files. The output is what I sent. I read > the link from the FAQ to http://jakarta.apache.org/site/source.html > and there it suggests using: cvs diff -u Main.java >> patchfile.txt
"Unified" diff is the "-u" on the command line, it creates a slightly different, more compact and for some people more readable output. The main difference is that you have a good chance that a unified diff can be applied to a given file by patch even if that file is not of the same version as the one the diff has been created against - the output contains enough context so that patch can apply some heuristics to adapt line numbers. > I thought that the output would be the same in jCVS. (Guess not). Never used jCVS, but I'd guess there is an option to add the -u switch. Stefan -- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
