Return-Path: Mailing-List: contact cocoon-dev-help@xml.apache.org; run by ezmlm Delivered-To: mailing list cocoon-dev@xml.apache.org Received: (qmail 46836 invoked from network); 29 May 2000 20:55:55 -0000 Received: from bender.bawue.de (postfix@193.197.13.1) by locus.apache.org with SMTP; 29 May 2000 20:55:55 -0000 Received: from eisbaer.bb.bawue.de (eisbaer.bb.bawue.de [193.197.13.2]) by bender.bawue.de (Postfix) with ESMTP id 8A3BD815; Mon, 29 May 2000 22:55:47 +0200 (CEST) Received: (from uucp@localhost) by eisbaer.bb.bawue.de (8.9.3/8.9.3) with UUCP id WAA18296; Mon, 29 May 2000 22:55:54 +0200 Received: (from uli@localhost) by niedermann.bb.bawue.de (8.9.3/8.9.3) id WAA02648; Mon, 29 May 2000 22:37:14 +0200 To: cocoon-dev@xml.apache.org Cc: giacomo.pati@pwr.ch Subject: Re: [Cocoon 2] build.bat, build.sh old versions References: <20000529075324.27208.qmail@web6203.mail.yahoo.com> In-Reply-To: Giacomo Pati's message of "Mon, 29 May 2000 00:53:24 -0700 (PDT)" From: Hans Ulrich Niedermann Date: 29 May 2000 22:37:13 +0200 Message-ID: Lines: 19 User-Agent: Gnus/5.0803 (Gnus v5.8.3) XEmacs/21.1 (Bryce Canyon) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Rating: locus.apache.org 1.6.2 0/1000/N Giacomo Pati 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