Re: Please! - this question has been asked before by others but never answered?

Jody Shumaker wrote:
> On 2/7/06, Royce Fessenden <rfessenden@dmp.com> wrote:
>>
>>
>> Several times I have needed to edit a patch for various reasons. About 50%
>> of the time it doesn't work due to some syntax issue that I have not been
>> able to figure out. I've searched the mailing list of Tortoise, Subversion,
>> as well as a general google search, but have never found any documentation
>> on the "unified diff format".
>>
>
> You must be using a different goodle than the one I'm using, I did a
> search on "unified diff format" and the very first result was
> http://www.gnu.org/software/diffutils/manual/html_node/Unified-Format.html
> which details the format, and gives an example. Plenty of other valid
> results in that same search.

Subversion's unified diff is very slightly different from GNU in that it
prepends an Index line and a row of 67 '=', and the +++/--- filenames
are followed by the source revision. The actual diff content is the same.

TortoiseMerge needs SVN output in order to determine which revision the
patch was made against, so plain Gnu diff output is not adequate.

If you edit a file in your WC and TSVN->CreatePatch you will see how it
works.

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org