Re: adding on branch

"Paul Edwards" <[email protected]> wrote in message news:[email protected]...
> The deficiencies I know of are:
> 6. (still need to verify) diff -c8 produced "!" for added lines in cvs 1.11.5

Scratch that one.  I didn't realise that context diffs
would match one "!" to multiple "!".  CVS faithfully mimicks
"Unix" diff.  :-)

BFN.  Paul.


% cat file1.txt
line1
line2
line3
line4
line5
% cat file2.txt
line1
line2
line3a
line3b
line4
line5
% diff -c file1.txt file2.txt
*** file1.txt   Thu May 29 13:27:59 2003
--- file2.txt   Thu May 29 13:28:15 2003
***************
*** 1,5 ****
  line1
  line2
! line3
  line4
  line5
--- 1,6 ----
  line1
  line2
! line3a
! line3b
  line4
  line5