Introduction to history deltas

[Johan Rydberg]

"John Yates" <jyates at netezza.com> writes:

> As I understand it the text deltas are delta between clear text
> versions of files, not between weaves.  Does this not preclude
> using some of the more powerful merge algorithms?

It is also possible to store annotated text deltas; Martin writes
on the wiki (WeaveDeltas page):

  "[Martin] assert (currently without proof) that it's possible to 
   do weave-style or cdv-style merges on only annotated copies 
   without needing the full weave."

Where annotated copies means text with information from where each
line originated.

> Could not the text delta be redefined to express how to construct
> a new weave from an earlier weave?  

That is also a possibility.  I have yet to look closer at that.  Maybe
something similar to what Aaron suggested [1] can be used.

 [1] http://www.aaronbentley.com/weavediff

(seems like Aarons server is down for the moment, though.)

~j