Path: utzoo!utgpu!water!watmath!clyde!bellcore!rutgers!aramis.rutgers.edu!porthos.rutgers.edu!mende
From: mende@porthos.rutgers.edu (Bob Mende Pie)
Newsgroups: ru.qa,comp.software-eng,dcs.csgss
Subject: Re: Looking for a program to merge two files interactively
Message-ID: <Jul.22.11.29.48.1988.1642@porthos.rutgers.edu>
Date: 22 Jul 88 15:29:49 GMT
References: <Jul.22.07.54.48.1988.21328@paul.rutgers.edu>
Distribution: na
Organization: Yows `R' us
Lines: 44

In article <Jul.22.07.54.48.1988.21328@paul.rutgers.edu>
pratt@paul.rutgers.edu (Lorien Y. Pratt) writes:
] I have a program which consists of about 100 different files.  A couple of
] months ago, I began two sets of modifications to this program, each of which
] was kept in a different directory.  I now would like to merge these
] modifications into a single program.
]
] However, there is no way that I want this to happen automatically.  What
] I would like is:
]   1) A two-up listing of each file which is different, showing where the
]      differences are and what they are.

the program you want is sdiff.   sdiff is a side-to-side diff between
files.  On the suns it lives is /usr/5bin and on a pyramid it is
gotten via att sdiff.   Look at the man page for more info.  It should
do exactly what you want.

]   2) An interactive program which will take as input the two different files,
]      and for each section which is different, prompt me interactively
]      as to whether one or the other or both should be included in a
]      third, output file.  I would also like an option to flag a block
]      of just-included text so that I can look at it later and make
]      modifications in an editor.

There is a program called patch that takes the output diff (not sdiff)
and merges files, look at man diff and man patch for more infomation
 
] Since I'm sure I'm not the first person in the world to need to do
] this, I thought I'd post this request for any programs that anyone
] might have which do what I ask.  I know about diff and sccs, but they
] seem to have an awful lot more complexity than the fairly simple
] functions listed above that I want.  Thanks for any pointers or help,

while sccs/rcs and diff may seem complicated, they are the way to
go... the kind of thing that you are talking about is what {r,sc}cs
was created for.    And diff is not complicated unless you want it to
be... 


					/Bob...
-- 
{...}!rutgers!mende	  mende@aramis.rutgers.edu	   mende@zodiac.bitnet

Let's send the Russians defective lifestyle accessories!