problem applying patch 2

Article View: comp.windows.x

Article #36658

#36658

From: Richard Young
Date: Sat, 10 Feb 1990 23:00

30 lines
1532 bytes

Hi,

I just picked up "fixes 2" from the xstuff mail server.  There was an
extra carriage return in the file which caused our version of patch to
choke.  I had already stripped off the leading comments, so I can't
give you a line number (except to say that it is in the mid 1400's).
The text leading up to the problem is:


*** /tmp/,RCSt1a21346	Wed Feb  7 18:47:41 1990
--- mit/clients/xdm/Imakefile	Wed Feb  7 18:47:28 1990
***************
*** 39,47 ****
         PROGRAMS = xdm xdmshell sessreg
  
  #if !HasVoidSignalReturn
!      SIGDEFS = -DSIGNALRETURNSINT
  #endif
!         DEFINES = -DBINDIR=\"$(BINDIR)\" -DXDMDIR=\"$(XDMDIR)\"
$(SIGDEFS) $(DESDEFS) ConnectionFlags                            ^
                                                                 |
                                                                 |
                           This carriage return should not be here

After joining (the last two lines shown here) the patch applied smoothly.

					Richard Young
					Bell Northern Research
					bnrmtl!spock@larry.mcrcim.mcgill.edu
					"Vulcans never bluff"

Technical Details

Message-ID: <9002102300.AA08671@bnrmtl.com>

Path:

arc1-ca.pugleaf.net!utzoo!utgpu!jarvis.csri.toronto.edu!mailrus!wuarchive!zaphod.mps.ohio-state.edu!usc!snorkelwacker!bloom-beacon!bnrmtl.UUCP!spock

Show Full Headers

Complete Article Headers

Path: arc1-ca.pugleaf.net!utzoo!utgpu!jarvis.csri.toronto.edu!mailrus!wuarchive!zaphod.mps.ohio-state.edu!usc!snorkelwacker!bloom-beacon!bnrmtl.UUCP!spock
From: spock@bnrmtl.UUCP (Richard Young)
Newsgroups: comp.windows.x
Subject: problem applying patch 2
Message-ID: <9002102300.AA08671@bnrmtl.com>
Date: 10 Feb 90 23:00:26 GMT
Sender: daemon@athena.mit.edu (Mr Background)
Organization: The Internet
Lines: 30