Re: Linex need serious concurent version control software ?

[Mike Castle]

In article <address@hidden>,
Bogdan <address@hidden> wrote:
>I just wander if cvs can make merging kylix project files?
>My guess is that it will make a mess.

I have used CVS (and perforce) to manage the .bpr files on other platforms.

It's doable, if a bit of a pain.

It's pretty much a straight forward XML file.

However, it IS formated by software which likes to throw in line breaks at
obnoxious points.

For example, instead of something like the xml equivalent of:

SOURCES = 
  foo.c
  bar.c
  baz.c

it does

SOURCES = foo.c bar.c baz.c

with line wraps (probably around 80 chars or so).  I believe it also keeps
a listing for object files as well.

So, if you add a new file at the beginning, it changes a LOT of lines.

So, yes, that can make merging a significant pain.  But I don't know of any
tool that would handle that well.

What I usually do is merge, handle the sources conflicts, and nuke the
object file listing, and let the borland tools rebuild those parts of it.
Occasionally there may be some conflicts with defines and what not.

But, to be honest, most of those issues exist with Makefile as well.

At least with being xml, you could probably write a filter that could put
each item on it's own line, which could reduce conflicts.

mrc
-- 
     Mike Castle      address@hidden      www.netcom.com/~dalgoda/
    We are all of us living in the shadow of Manhattan.  -- Watchmen
fatal ("You are in a maze of twisty compiler features, all different"); -- gcc