From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: "Stefan Monnier" Newsgroups: gmane.emacs.help Subject: Re: PCL-CVS, How To Merge? Date: 19 Jun 2003 10:43:13 -0400 Organization: Yale University Sender: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Message-ID: <5ladce9lha.fsf@rum.cs.yale.edu> References: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1056035175 15607 80.91.224.249 (19 Jun 2003 15:06:15 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Thu, 19 Jun 2003 15:06:15 +0000 (UTC) Original-X-From: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Thu Jun 19 17:06:14 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 19T0zN-00043Q-00 for ; Thu, 19 Jun 2003 17:06:14 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.20) id 19T0yj-0003Mj-Vn for gnu-help-gnu-emacs@m.gmane.org; Thu, 19 Jun 2003 11:05:33 -0400 Original-Path: shelby.stanford.edu!newsfeed.stanford.edu!nntp.cs.ubc.ca!logbridge.uoregon.edu!canoe.uoregon.edu!news.wss.yale.edu!rum.cs.yale.edu!rum.cs.yale.edu Original-Newsgroups: gnu.emacs.help Original-Lines: 28 Original-NNTP-Posting-Host: rum.cs.yale.edu Original-X-Trace: news.wss.yale.edu 1056033796 13847 128.36.229.169 (19 Jun 2003 14:43:16 GMT) Original-X-Complaints-To: news@news.wss.yale.edu Original-NNTP-Posting-Date: Thu, 19 Jun 2003 14:43:16 +0000 (UTC) User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50 X-Original-NNTP-Posting-Host: rum.cs.yale.edu X-Original-Trace: 19 Jun 2003 10:43:13 -0400, rum.cs.yale.edu Original-Xref: shelby.stanford.edu gnu.emacs.help:114581 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:11073 X-Report-Spam: http://spam.gmane.org/gmane.emacs.help:11073 Galen> Point is on line saying need-merge. What is the command to Galen> make this happen? Whenever I hit `d E' on either a marked or Galen> unmarked line, I get the message: Galen> `merge' is not applicable to any of the selected files. In its constant efforts to keep things confusing, PCL-CVS uses `merge' in two different ways: - bring in pending changes from the repository. - resolve conflicts. `imerge' (bound to `d E') should really be called "resolve". > You use "update", which is somewhat confusingly bound to "O". This It's done this way to check whether people are attentive. If after seeing that the obvious `u' doesn't work they try `U', PCL-CVS immediately punishes them for their lack of respect for the manual (which badly needs improvement, of course). > case you use `vc-resolve-conflicts' on the buffer, which gives you > ediff, and lots of colours. Note that `vc-resolve-conflicts' will only use the information that's in the working file (i.e. using the conflict markers) which typically lacks the ancestor info. `d E' does a better job, but it does not always work because CVS does not save the ancestor info anywhere. Stefan "PCL-CVS maintainer"