Diff and Diff3 in Smalltalk (was Re: [squeak-dev] Differencing ordered
sets)
Tony Garnock-Jones
tonyg at lshift.net
Tue Jul 8 13:16:19 UTC 2008
Hi Alexandre,
Coincidentally, a couple of weeks back I write some code for
Hunt-McIlroy diff, and a diff3 implementation built on top.
I've just committed it to squeaksource:
http://www.squeaksource.com/DiffMerge.html
To get a quick overview of the API, see the test cases in classes
Diff3Tests and HuntMcilroyDiffTests. I'd like to implement Bram Cohen's
diff algorithm as another subclass of GenericDiff, too.
I've blogged about it:
http://www.lshift.net/blog/2008/07/01/smalltalk-vs-javascript-diff-and-diff3-for-squeak-smalltalk
http://www.lshift.net/blog/2008/06/06/diff3-merging-and-distributed-version-control
Regards,
Tony
Bergel, Alexandre wrote:
> Dear list,
>
> Is there a diff-like mechanism in Squeak? I've heard there is a diff
> tool in Squeak that operates on texts. Anyone has the url?
> Although I want to be able to work with any arbitrary ordered sets,
> beginning with texts might be a good start.
>
> Cheers,
> Alexandre
> --_,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:
> Alexandre Bergel http://www.bergel.eu
> ^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.
>
>
>
>
>
>
>
--
[][][] Tony Garnock-Jones | Mob: +44 (0)7905 974 211
[][] LShift Ltd | Tel: +44 (0)20 7729 7060
[] [] http://www.lshift.net/ | Email: tonyg at lshift.net
More information about the Squeak-dev
mailing list
|