[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: using files with .xls and .doc in CVS

From: Steve Greenland
Subject: Re: using files with .xls and .doc in CVS
Date: Mon, 11 Feb 2002 18:08:49 -0600
User-agent: Mutt/1.2.5i

On Mon, Feb 11, 2002 at 07:45:58PM +0100, Janning Vygen wrote:
> Why shouldn't i do it?? I usually manage lots of images and icons 
> with CVS. Whats wrong with it?

How do you resolve the conflicts when two people work on the same image
at the same time?

That's a semi-rhetorical question -- you, Janning, have obviously
figured out something that works for you. But that's the basic problem
with binary (non-mergable) files -- there's no way to deal with
non-sequential edits, which is CVSs forte. Such files are better dealt
with in a locking non-concurrent system. Or such is the party line -- I
suspect a lot of people on the list keep a small number of such files
in CVS, because it's better than nothing (you can at least keep track
of linear revisions), and setting up a second, non-compatable VCS for 3
files is a non-starter. We put them in, and we make it damn clear that
for these particular files, CVS is a simple bookkeeping system, and
exactly one (1) person is to edit those files.

But I worry about them, and try to minimize such files.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]