cocoon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ben Laurie <...@algroup.co.uk>
Subject Re: [Cocoon 2] build.bat, build.sh old versions
Date Sun, 11 Jun 2000 14:56:32 GMT
Giacomo Pati wrote:
> 
> Vielen Dank, Uli.
> 
> It is may of interest to others on cocoon-dev.

In fact, if a "cvs update" is required, "cvs commit" will tell you so.
So this was not the cause of the version rollback.

The usual cause is someone copying old files from somewhere else over
the top of files that have already been updated.

Cheers,

Ben.

> 
> Giacomo
> 
> Hans Ulrich Niedermann wrote:
> >
> > Giacomo Pati <pati_giacomo@yahoo.com> writes:
> >
> > > Does anybody know what exactly happens if someone with an old CVS
> > > repository on disk does a "cvs commit"?
> >
> > > Does this change back newer thing to the old one? Makes it practical
> > > sense to do a "cvs update" prior to a "cvs commit" (or does this
> > > change revisions made locally back to the older version from the
> > > cvs?)
> >
> > According to the Cederqvist manual, "cvs update" should be run before
> > a commit (this is at least how I interpret the Cederqvist). "cvs
> > update" merges your own changes with changes other people could have
> > made in the repository - in your local copy of the files. CVS then
> > tells you which files contains conflicts, marks them within the
> > text. Then you can resolve the conflicts and use "cvs commit" to check
> > the file into the repository.
> >
> > Uli
> 
> --
> PWR GmbH, Organisation & Entwicklung      Tel:   +41 (0)1 856 2202
> Giacomo Pati, CTO/CEO                     Fax:   +41 (0)1 856 2201
> Hintereichenstrasse 7                     Mailto:Giacomo.Pati@pwr.ch
> CH-8166 Niederweningen                    Web:   http://www.pwr.ch

--
http://www.apache-ssl.org/ben.html

Coming to ApacheCon Europe 2000? http://apachecon.com/

Mime
View raw message