[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: Rob Helmer
Subject: Re: using files with .xls and .doc in CVS
Date: Mon, 11 Feb 2002 22:20:22 -0800
User-agent: Mutt/1.2.5i


On Mon, Feb 11, 2002 at 10:37:40PM -0600, Pierre Asselin wrote:
> Janning Vygen <address@hidden> writes:
> >Am Montag, 11. Februar 2002 18:21 schrieb Matt Riechers:
> >> After seriously reconsidering the decision to manage non-mergable
> >> files with CVS,
> >Why shouldn't i do it?? I usually manage lots of images and icons 
> >with CVS. Whats wrong with it?
> Your .xls and .doc files are more likely to changes than .gif files.
> The lack of merging will be more painful.

Why do so many on the list poo-poo using binaries in CVS? 

If you accept the fact that you are using non-text files, use 
cvswrappers and/or the "cvs admin" command knowledgably.

Since the file is not text, CVS cannot merge for you. Period.
"cvs diff" is no longer useful, except to tell if there is
the simplest change. Individual images ( for instance ) cannot
be distinguished the way lines of code are. This isn't bad,
just different.

Yes, the RCS file will double in size with every revision. 
I don't think you should keep binaries without *at least* this level
of knowledge; having a sysadmin/build&release-manager always helps
with this ( CVS is a powerful and complex development tool, like 
your build system, your compiler, your editor, etc ).

So, the way your merge a "png" or proprietary office format
(.doc, .xls etc) is :

1) try to check in your change to orig.png
2) up-to-date check fails
3) if desireable, cvs log to figure out who made the last checkin, talk to them
4) mv orig.png orig_mine.png, cvs update orig.png
5) open orig_mine.png and orig.png in gimp and resolve the differences
5) mv orig_mine.png orig.png, checkin, my change is authoritive
5) rm orig_mine.png, leave it as-is, the other person's change is authoritive

( 5 is determined by step 3 or by looking at both versions in gimp ).

You can let CVS move the file for you when the conflict happens,
but I like being able to have control over the filename in all steps
of the process.

Rob Helmer

reply via email to

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