From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Galen Boyer Newsgroups: gmane.emacs.help Subject: Re: PCL-CVS, How To Merge? Date: 19 Jun 2003 10:07:10 -0500 Sender: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Message-ID: References: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1056035440 17171 80.91.224.249 (19 Jun 2003 15:10:40 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Thu, 19 Jun 2003 15:10:40 +0000 (UTC) Original-X-From: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Thu Jun 19 17:10:38 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 19T13Z-0004Sc-00 for ; Thu, 19 Jun 2003 17:10:33 +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 19T13a-00059X-QU for gnu-help-gnu-emacs@m.gmane.org; Thu, 19 Jun 2003 11:10:34 -0400 Original-Path: shelby.stanford.edu!newsfeed.stanford.edu!cyclone.bc.net!snoopy.risq.qc.ca!newsfeed.news2me.com!newsfeed2.easynews.com!newsfeed1.easynews.com!easynews.com!easynews!c03.atl99!news.webusenet.com!newscene!novia!novia!sequencer.newscene.com!not-for-mail Original-Newsgroups: gnu.emacs.help Original-Lines: 28 Original-Sender: galenboyer@hotpop.com User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.2 Original-Xref: shelby.stanford.edu gnu.emacs.help:114582 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:11074 X-Report-Spam: http://spam.gmane.org/gmane.emacs.help:11074 On 19 Jun 2003, p.lord@russet.org.uk wrote: >>>>>> "Galen" == Galen Boyer writes: > > Galen> Point is on line saying need-merge. What is the > Galen> command to make this happen? Whenever I hit `d E' on > Galen> either a marked or unmarked line, I get the message: > > Galen> `merge' is not applicable to any of the selected > Galen> files. > > Galen> -- Galen Boyer > > > You use "update", which is somewhat confusingly bound to > "O". This will result either in "merge" changing to "modified"; > that is the changes in the repository have been added to your > version without problems, or "conflict" which means CVS can't > work it out, in which case you use `vc-resolve-conflicts' on > the buffer, which gives you ediff, and lots of colours. Okay, I'll give that a try. For the record (as most already know) PCL-CVS is a wonderful package. I am able to constantly have a very informative conversation with CVS. -- Galen Boyer