From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Unknown Newsgroups: gmane.emacs.help Subject: pcl-cvs / vc workflow description desired. Date: Fri, 07 Mar 2003 04:18:46 GMT Sender: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Message-ID: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7Bit X-Trace: main.gmane.org 1047010916 1748 80.91.224.249 (7 Mar 2003 04:21:56 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Fri, 7 Mar 2003 04:21:56 +0000 (UTC) Original-X-From: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Fri Mar 07 05:21:55 2003 Return-path: Original-Received: from monty-python.gnu.org ([199.232.76.173]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 18r9Mp-0000S3-00 for ; Fri, 07 Mar 2003 05:21:55 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18r9LE-0004LN-0B for gnu-help-gnu-emacs@m.gmane.org; Thu, 06 Mar 2003 23:20:16 -0500 Original-Path: shelby.stanford.edu!newsfeed.stanford.edu!news-spur1.maxwell.syr.edu!news.maxwell.syr.edu!cyclone.bc.net!sjc70.webusenet.com!news.webusenet.com!news03.bloor.is.net.cable.rogers.com!news01.bloor.is.net.cable.rogers.com.POSTED!not-for-mail Original-From: Le Wang Original-Newsgroups: gnu.emacs.help Original-Lines: 21 User-Agent: KNode/0.7.1 Original-NNTP-Posting-Host: 24.192.182.203 Original-X-Complaints-To: abuse@rogers.com Original-X-Trace: news01.bloor.is.net.cable.rogers.com 1047010726 24.192.182.203 (Thu, 06 Mar 2003 23:18:46 EST) Original-NNTP-Posting-Date: Thu, 06 Mar 2003 23:18:46 EST Original-Xref: shelby.stanford.edu gnu.emacs.help:110902 Original-To: help-gnu-emacs@gnu.org X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , Errors-To: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.help:7403 X-Report-Spam: http://spam.gmane.org/gmane.emacs.help:7403 Hi, I'm trying to use pcl-cvs and/or vc with GNU Emacs, and not having a very good time with it. In pcl-cvs, I can do the normal stuff (update, commit, add, etc). But when I see the dreaded "need to merge" message, I have no idea what's going on. What do I do? It seems that it's very easy to screw up at this point. I press 'd' 'E', and get the message "Merge is not applicalbe to any of the selected files. But the line says "need to merge" right there. I fumble around and press some keys before I know it, it's all "up-to-date", of course the contents is crap and I've just erased someone else's work. I have other confustions such as why all these .#file.version files are popping up in my working dir. I want to know the work-flow that I should be following. At this point I'm so confused and it's so volatile that I think I need keystroke by keystroke help. Any help? Ohh, and vc, I have no idea what's going on there. How do I quickly commit a file I'm editing? -- Le