DragonFly BSD
DragonFly submit List (threaded) for 2004-02
[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]

Re: motd update


From: Robert Garrett <rg70@xxxxxxxxxxxxx>
Date: Mon, 02 Feb 2004 20:15:15 -0600

onflybsd.org> <401ecf9d$0$183$415eb37d@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> <401ee202$0$181$415eb37d@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
User-Agent: KNode/0.7.2
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7Bit
Lines: 46
NNTP-Posting-Host: 64.217.143.154
X-Trace: 1075774526 crater_reader.dragonflybsd.org 181 64.217.143.154
Xref: crater_reader.dragonflybsd.org dragonfly.submit:690

Dylan Reinhold wrote:

> Robert Garrett wrote:
> 
>> Dylan Reinhold wrote:
>> 
>> 
>>>>
>>>>committed
>>>
>>>Robert the diff did not apply properly, the current file in cvs is
>>>broken... Do you want me to send you another diff on the broken version?
>>>

Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: motd
|===================================================================
|RCS file: /home/dcvs/src/etc/rc.d/motd,v
|retrieving revision 1.6
|diff -u -r1.6 motd
|--- motd        1 Feb 2004 03:32:08 -0000       1.6
|+++ motd        2 Feb 2004 23:44:45 -0000
--------------------------
Patching file motd using Plan A...
Hunk #1 failed at 28.
Hunk #2 failed at 40.
2 out of 2 hunks failed--saving rejects to motd.rej
done
[Mon 04/02/02 20:11 CST][p0][i386/freebsd4.7/1.0-CURRENT][4.0.6]
<rob@gold:/usr/src/etc/rc.d>
zsh/2 3019 [21] %

Thats on a fresh checkout



>>>Dylan
>> 
>> yes
> 
> Ok here is a diff from the version in cvs to the working one..
> 
> Dylan




[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]