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

Royce Fessenden 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”.
>
>
>
> For example, I created a patch using BeyondCompare and Tortoise fussed
> because it did not include the “Index: …” line. Another time I had to
> edit part of the patch because code changes made it impossible to sync.
> I never could get “Apply Patch” to work and ended up deleting a bunch of
> lines, to apply the patch, then had to manually make the deleted changes.
>
>
>
> Where can I find, or determine, what the syntax is for the “unified
> diff format” as implemented by Tortoise?

It's the diff format Subversion uses. And only that one is known to
TortoiseMerge. So if you use other programs to create the diff,
TortoiseMerge won't be able to apply it.

Stefan

-- 
        ___
   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