*BSD News Article 21698


Return to BSD News archive

Newsgroups: comp.os.386bsd.questions
Path: sserve!newshost.anu.edu.au!munnari.oz.au!news.Hawaii.Edu!ames!elroy.jpl.nasa.gov!swrinde!cs.utexas.edu!uunet!ftpbox!mothost!mdisea!uw-coco!quick!ole!ssc!eskimo!storm
From: storm@eskimo.com (Marc Wandschneider)
Subject: help with diff
Message-ID: <CE5B76.Cuu@eskimo.com>
Organization: /usr/lib/news/organi[sz]ation
Date: Thu, 30 Sep 1993 02:42:48 GMT
Lines: 39


Moo!

	I was wondering if somebody could help me out quickly with
	a rather simple diff quetsion (I've never really used it
	before).

	I have two src trees:

	/usr/vomit/src1
	/usr/vomit/src2

	src2 is the same program as src1, except that it has a whole
	pile of changes---New files, files removed, and changes
	to existing files.

	What I'd like to do is produce a SINGLE patch file that
	somebody who has the src1 tree could take and apply
	to src1 using patch -p -E (or something else, if more
	appropriate, again, I don't know....).

	I tried diff -c, but this didn't seem to take into consideration
	new files and removed files.

	Could somebody suggest to me what the command line would
	look like for what I'm doing (I would like to be as position
	independant as possible---Ie somebody with /u0/death/src1
	could still apply the patches)


	Merci.

						TOodlepip!
						Marc 'em.
-- 
----------------------------------------------------------------------------
Marc Wandschneider					    Redmond, WA
       "Satan has a stranglehold on my toilet and he won't let go!"
			- frm the Weekly World News