From: Martin Arver <martin.arver_at_gmail.com>
Date: Fri, 24 Feb 2006 18:31:40 +0100

I got curious and googled around. I found some potentially useful
tools. You might want to have a look at some of those.

Both of these are visual patch-tools:

http://freshmeat.net/projects/xfdiff/
http://freshmeat.net/projects/patcheditor/


On 2/24/06, Martin Arver <martin.arver_at_gmail.com> wrote:
> That sounds like a good way of doing it. The only other thing I can
> think of making it easier , is to use a visual cvs tool like Cervisia.
> But I have no experience with those. I guess Cervisia covers diff as
> well as the other aspects of CVS.
>
> On 2/24/06, gl <gl_at_ntlworld.com> wrote:
> > >I am not quite sure if I understand you correctly, but if you want to
> > > create a diff for one file against CVS then you do 'cvs diff -u file
> > >> patch' (snipped from
> >
> > The problem is where several mods are in the same file, and worse if they
> > appear in the same hunk together. You're then not only forced to adjust the
> > +/- line and range numbers in (to me) non-intuitive, but also cumulative
> > ways (line number changes higher up are supposed to ripple downwards).
> >
> > One solution that just ocurred to me is to copy my build folder, strip mods
> > I don't want included from the source files first, and then diff against
> > CVS. Is there an easier way though?
> > --
> > gl
> >
> >
>
Received on 2006-02-24