ediff question - XEmacs-Beta - XEmacs Mailing List Archives

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

2000

1999

1998

ediff question

Re: crypt (or tar) breakage?

Re: Copyright question for XEmacs...

Steve Dickey

Tuesday, 23 February 1999 Tue, 23 Feb '99

8:47 a.m.

(permalink)

How do I use ediff from within PCL-CVS to examine changes when a file is marked as -patched- by cvs? Currently, I get an error that: ediff can only merge files marked.... I only have read access to the xemacs tree. Or am I doing something really stupid? -- Steve

Reply

Show replies by date

Michael Kifer

Tuesday, 23 February Tue, 23 Feb

8:16 p.m.

(permalink)

How do I use ediff from within PCL-CVS to examine changes when a file is marked as -patched- by cvs? Currently, I get an error that: ediff can only merge files marked.... I only have read access to the xemacs tree. Or am I doing something really stupid?

This is really, pcl-cvs question rather than ediff question. But I think Adrian's subsequent response explains what happened. --michael

Reply

Justin Vallon

Wednesday, 24 February Wed, 24 Feb

5:13 a.m.

(permalink)

On Tue, 23 Feb 1999, Steve Dickey wrote:

How do I use ediff from within PCL-CVS to examine changes when a file is marked as -patched- by cvs? Currently, I get an error that: ediff can only merge files marked.... I only have read access to the xemacs tree. Or am I doing something really stupid?

Maybe the following is related, but maybe not. I recall vc-cvs being confused if: a) Check out a file b) Modify the file locally, don't commit c) Repository file is amended by another user d) 'cvs update', which results in a merge The CVS/Entries entry was: /jiffies_thread.c/1.4/Result of merge// It didn't consider jiffies_thread.c here as a file under CVS control. -Justin vallon(a)mindspring.com

Reply

9403

days inactive

9404

days old

xemacs-beta@xemacs.org

Manage subscription

2 comments

3 participants

tags (0)

participants (3)

Justin Vallon
Michael Kifer
Steve Dickey