I know I've been committing files that overwrite your changes, but this was
certainly not my intention. It wouldn't have happened if either (a) you had
adopted my updates, or (b) you had been developing in CVS (even if you
didn't adopt any updates from me, then I would still have a chance to adapt
or retract them).

This is why I have been urging you to develop in CVS along with me and
whoever else is contributing. As I said before, I deeply regret my previous
suggestion to branch the Csound code in CVS and for you to develop in your
own area. In my view this was a serious mistake on my part. I was trying to
find a way to keep working despite the fact that you were not developing in
CVS. I failed.

As long as you're not in CVS, then either I overwrite you, or you overwrite
me. I don't wish either to overwrite or to be overwritten, therefore I have
stopped contributing to Csound.

But even if there is a buildable system again in CVS, I have no reason to
contribute unless you are developing with files freshly updated from CVS
and immediately committing your changes back to CVS. 

Is this the case?

If you're worried about CVS messing up your files, all you need to do is
back them all up before you do anything; just copy them to another
directory or something. I do this myself every few days.

Original Message:
-----------------
From:  jpff@cs.bath.ac.uk
Date: Wed, 17 Mar 2004 14:38:30 +0000
To: csound-dev@eartha.mills.edu
Subject: [CSOUND-DEV:4359] Re: Getting in step


>>>>> "Michael" == Michael Gogins  writes:

 Michael> My main concern is what happens when people contribute changes to
sources in
 Michael> public Csound5 CVS.

 Michael> Will John Fitch update his private sources with others' changes
so that when
 Michael> he commits his own changes to CVS, the changes will be merged, or
will
 Michael> John's changes simply overwrite other contributions? This has
happened with
 Michael> my changes several times now.

 Michael> I don't think John intends this, but obviously it causes a real
problem, so
 Michael> much so that I've stopped contributing to Csound5 until we can
resolve this.

I have spent 3 days merging files, while attempting to keep a
buildable system.  As far as i can tell csound itself builds but the
anal/util trees are in various states of disrepair.  I updated a bunch
this morning but did not commit

On the other hand, from my point of view you have been committing
files which overwrite my changes.

==John ffitch


--------------------------------------------------------------------
mail2web - Check your email from the web at
http://mail2web.com/ .