Atreus420 wrote:
> I've been using TortoiseSVN to apply numerous patches to a game
> simulator called Mangos with no problems for a while a long time. It
> used to allow me to fix conflicts. Now it does not let me fix
> conflicts I get messages like these when a conflict appears. The only
> time I'm successful is if the patch was created (via TortoiseSVN) from
> that exact revision that is released and then applied.
>
> http://img301.imageshack.us/my.php?image=patchprobsrg4.jpg
>
> I believe this started happening after upgrading to 1.5. But I have
> reinstalled several times and even reverted back to 1.4.8 and I still
> experience these problems. I'm also using the 64-bit version on
> Windows XP x64. I've never had problems with these patches before.
> Either it would conflict or not, never seen this message before.
> Thanks for any help
TortoiseMerge tries to start TortoiseProc to get the exact file content
of the revision the patch was made for. For some reason, it can't start
TortoiseProc - did you install TSVN correctly?
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
Received on 2008-07-17 17:43:17 CEST
