[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: adding on branch
From: |
Paul Edwards |
Subject: |
Re: adding on branch |
Date: |
Thu, 29 May 2003 11:29:07 GMT |
"Paul Edwards" <kerravon@nosppaam.w3.to> wrote in message
news:NNaBa.5105$ES.56822@news-server.bigpond.net.au...
> 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
- Re: adding on branch, (continued)
- Message not available
- Re: adding on branch, Stefan Monnier, 2003/05/29
- Re: adding on branch, Derek Robert Price, 2003/05/29
- Message not available
- Re: adding on branch, Stefan Monnier, 2003/05/29
- Re: adding on branch, Mark D. Baushke, 2003/05/30
- Message not available
- Re: adding on branch, Paul Edwards, 2003/05/30
- Re: adding on branch, Mark D. Baushke, 2003/05/30
- Message not available
- Re: adding on branch, Stefan Monnier, 2003/05/28
- Re: adding on branch, Mark D. Baushke, 2003/05/28
- Message not available
- Re: adding on branch, Stefan Monnier, 2003/05/28
- Message not available
- Re: adding on branch, Paul Edwards, 2003/05/28
- Re: adding on branch,
Paul Edwards <=
- Re: adding on branch, Derek Robert Price, 2003/05/29
Re: adding on branch, Paul Edwards, 2003/05/30