create "diff file" ?

wizz@oz · Post by **wizz@oz** » 2004-02-06 04:15

how do i create a "diff file" between diffrent dc++ versions, Using VS NET 2003 Pro.

and most importatnt......hoe do i use it to merge into new source ?

Thx ppl.....

TheParanoidOne · Post by **TheParanoidOne** » 2004-02-06 05:32

Do a google for "diff" and "patch" and you will find all the information you need. The latter is what you would use to merge the patch into the source code.

Post by **GargoyleMT** » 2004-02-08 15:04

If you're migrating your own changes to a new DC++ version, not sending arne a patch for a feature, you might look at merge tools. An example of such is WinMerge.

Twink · Post by **Twink** » 2004-02-08 20:38

Araxis merge is a very nice merging program, although expensive.. they do have a 30 day free trial which may be enough for your needs was certainly enough to impress me alot.

wizz@oz · Post by **wizz@oz** » 2004-02-09 07:23

thx peeps....helped me big time......

Post by **GargoyleMT** » 2004-02-09 09:34

Twink wrote:Araxis merge is a very nice merging program, although expensive...

If you have discretionary income and value your time reasonably, it doesn't take very long before Araxis proves its worth.

Besides, the non-Pro/3-way compare is only $129 or so. Much cheaper than Visual Studio ($895+) or the Intel C++ compiler ($400).

WinMerge is crude by comparison, but is free.

Twink · Post by **Twink** » 2004-02-09 19:12

yeah but I get visual studio and some other microsoft things free from uni/work.