Anthony Stone wrote:
> At 17:46 on 5 January, Schwarz, Michael, MDVT9056 wrote:
>
> > I am looking for a tool to compare A N D merge two files, e.g. two
> > F90-sources.
> > In the past we used a commercial tool of hp called "softbench". This package
> > includes a program "softcom", which gives a side-by-side view of the two
> > files.
> > Then you can merge the two files into a new one. Thereby you can decide for
> > every line whether to use the left, the right or both lines. This is very
> > helpful to maintain a program by two or more persons in parallel.
> > Unfortunately hp does not support softbench for F90 so we no longer use this
> > tool.
> >
> > Does anybody know a tool which does a some similar job ? Or give me any help
> > or hint ?
>
> Xemacs provides this (from the menubar,
> Tools -> Compare -> Two Files..., for example) and it highlights the
> differing regions for you so that you don't have to look at every
> line. I don't know how I ever managed without it.
>
For me, it's xdiff:
http://reality.sgi.com/rudy/xdiff/
It, too, highlights the different text and allows you to pick and choose which
lines/regions you want to use.
An older version (2.0) appears to be available for hp-ux, but that version will do
what you're asking, with the exception of taking both lines. xdiff does not do
anything special for Fortran or any other files; it's just a "diff" with a nice
GUI.
- Dave
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|