|
|
ru.unix- RU.UNIX ---------------------------------------------------------------------- From : Eugene Grosbein 2:5006/1 10 Jun 2003 16:41:06 To : All Subject : patch --------------------------------------------------------------------------------
# patch <t
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: gw-c-3.cfg
|===================================================================
|RCS file: /usr/local/cvsroot/cisco/config/gw-c-3.cfg,v
|retrieving revision 1.16
|retrieving revision 1.71
|diff -u -r1.16 -r1.71
|--- gw-c-3.cfg 15 Jul 2002 02:52:57 -0000 1.16
|+++ gw-c-3.cfg 10 Jun 2003 08:16:42 -0000 1.71
--------------------------
Patching file gw-c-3.cfg using Plan A...
Hunk #1 failed at 1.
Hunk #2 failed at 15.
Hunk #3 failed at 35.
Hunk #4 failed at 56.
Hunk #5 failed at 64.
Hunk #6 succeeded at 129 with fuzz 2 (offset 35 lines).
Hunk #7 failed at 155.
Hunk #8 failed at 166.
Hunk #9 failed at 191.
Hunk #10 failed at 208.
Hunk #11 succeeded at 248 (offset 45 lines).
Hunk #12 succeeded at 247 (offset 35 lines).
Hunk #13 succeeded at 266 (offset 45 lines).
patch: **** misordered hunks! output would be garbled
Это что такое? Файл t получен путем cvs diff -r1.16 -r1.71 gw-c-3.cfg >t,
что еще за misordered hunks? Штатный patch на FreeBSD 4.8-STABLE.
Eugene
--- slrn/0.9.7.4 (FreeBSD)
* Origin: Svyaz Service JSC (2:5006/1@fidonet)
Вернуться к списку тем, сортированных по: возрастание даты уменьшение даты тема автор
Архивное /ru.unix/260935009f8a0.html, оценка из 5, голосов 10
|