Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
Why do you do this???? CVS is specifically designed to enable several persons to work on the *same* project at the *same* time. You should not create branches just because you are several people working, only if you want to isolate the stable TRUNK revisions from potentially unstable development revisions. But also then all of the persons working on the project should work on the *same* branch. Bo -----Original Message----- From: cvsnt-bounces at cvsnt.org [mailto:cvsnt-bounces at cvsnt.org]On Behalf Of Andreas Tscharner Sent: den 28 oktober 2003 08:02 To: cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook Subject: [cvsnt] Update branch from head Hello World, First of all: Thank you for developing CVSNT. Great product. Now my problem: I've checked out the HEAD of our project and as I have to work on several machines I created a branch for me. Now I want to be as close as possible to the HEAD, so I merged from the HEAD to my branch. This marks all files that changed in the HEAD changed in my branch and I have to commit them, otherwise the next merge from the HEAD (one day later) may cause conflicts. If I want to check in the file I changed in my branch into HEAD, I either need to know which files I changed or I merge my complete branch into HEAD marking all files changed that were changed on my branch and therefore I have to commit all of them, even if they didn't change in the HEAD. So I wanted to ask: Is there a way to update my branch from the HEAD (and not merge)? Thank you in advance and best regards Andreas -- Andreas Tscharner andreas.tscharner at metromec.ch ------------------------------------------------------------------------ Real coders don't comment their code. It was hard to write, it should be hard to understand. -- from the Linux Kernel Mailinglist _______________________________________________ cvsnt mailing list cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt https://www.march-hare.com/cvspro/en.asp#downcvs