Re: What to expect after 0.99.8
- From
Horst von Brand <vonbrand@inf.utfsm.cl>
- Date
- Oct 3, 2005, 21:39 UTC
- Message-ID
- <200510032139.j93Ld6xg026499@laptop11.inf.utfsm.cl>
- In-Reply-To
- <alan@chandlerfamily.org.uk>
Alan Chandler <alan@chandlerfamily.org.uk> wrote:
Show 7 quoted lines
> On Monday 03 Oct 2005 01:14, Junio C Hamano wrote: > ... > > > > Technical (heavier) > > ------------------- > ... > > * Look at libified GNU diff CVS seems to use, or libxdiff.
Show 5 quoted lines
> I did wonder today in response to a discussion at work about version control > of documentation, whether git could in some way understand OpenDocument > format and allow some form of merging of concurrent changes to the same > document. I am not sure if just unzipping the files and applying standard > merge strategies the resultant xml would be good enough.
A student of mine worked on layering SCM under a code design tool that uses XML as its representation of the project it is working on. He started with CVS, and ended up grafting a problem-specific merge strategy on top. The standard merge from CVS just messed everything up. Dunno if this is very relevant for OASIS, but I suspect you'd see the same.
-- Dr. Horst H. von Brand User #22616 counter.li.org Departamento de Informatica Fono: +56 32 654431 Universidad Tecnica Federico Santa Maria +56 32 654239 Casilla 110-V, Valparaiso, Chile Fax: +56 32 797513