Not sure if this meets everyone's needs, but Subversion has their
differencing code.

On 11/3/06, Nick <[EMAIL PROTECTED]> wrote:
Personally I always use winmerge http://winmerge.org/. When it comes
to merging files from the old sdk to the new sdk, I use a program
called KDIFF3 http://kdiff3.sourceforge.net/.

Kdiff3 at this time has problems working on windows. I usually dual
boot to fedora core 5 and run kdiff3 from there. It works flawlessly,
and it is free.

http://winmerge.org/ (two way merging)
http://kdiff3.sourceforge.net/ (three way merging)

When you use kdiff3, make sure you have the original sdk that you used
for your current codebase(A), your current codebase(B), and the latest
sdk codebase you want to merge into(C). Kdiff3 is a bit tricky at
first, but it is a powerful tool that can save you many hours.

If you have any questions I'll be happy to answer them.




On 11/3/06, Stephen Swires <[EMAIL PROTECTED]> wrote:
> This is more of a general thing to do with Source SDK updates, but does
> anyone know any good (freeware) tools that can tell detect differences
> in files so I know which new files I'll need to replace/copy from?
>
> _______________________________________________
> To unsubscribe, edit your list preferences, or view the list archives, please 
visit:
> http://list.valvesoftware.com/mailman/listinfo/hlcoders
>
>

_______________________________________________
To unsubscribe, edit your list preferences, or view the list archives, please 
visit:
http://list.valvesoftware.com/mailman/listinfo/hlcoders



_______________________________________________
To unsubscribe, edit your list preferences, or view the list archives, please 
visit:
http://list.valvesoftware.com/mailman/listinfo/hlcoders

Reply via email to