Re: merge/diff

[Mike Castle]

On Fri, Mar 02, 2001 at 03:52:03PM -0700, Derek Scherger wrote:
> Is there any way to control the diffing done by cvs update -j so that it
> ignores whitespace differences? At the moment I'm reduced to manually
> applying the changes that cvs diff -bw sees rather than trying to fix up
> the conflicts caused by merging. Neither situation is particularly
> pleasant however!

If you do a cvs diff -bw -u and then use patch, do you get fewer conflicts than
using cvs straight forward?

I know that in the past I had a situation where I could not get cvs to
merge and had to resort to using the patch program externally after
generating diffs in a slightly different manner.

mrc
-- 
       Mike Castle       Life is like a clock:  You can work constantly
  address@hidden  and be right all the time, or not work at all
www.netcom.com/~dalgoda/ and be right at least twice a day.  -- mrc
    We are all of us living in the shadow of Manhattan.  -- Watchmen