oldchar = '%c', newchar = '%c' Out-of-sync patch, lines %s,%s -- mangled text or line numbers, maybe?Can't get file attributes of %s %smisordered hunks! output would be garbled Offset changing from %s to %s Reversed (or previously applied)warning: the '-b %s' option is obsolete; use '-b -z %s' instead --version-control or -V optionbackup basename prefix is emptyFailed to duplicate standard outputFailed to redirect messages to standard errorFile %s: can't change file type from 0%o to 0%o. Invalid file name %s -- skipping patch File %s: git binary diffs are not supported. Not enough memory to try swapped hunk! Assuming unswapped. fatal internal error in abort_hunk_context
Ran out of memory using Plan A -- trying again...
Not deleting file %s as content differs from patch Not setting time of file %s (time mismatch) Not setting time of file %s (contents mismatch) -- saving rejects to file %s -p NUM --strip=NUM Strip NUM leading components from file names. -F LINES --fuzz LINES Set the fuzz factor to LINES for inexact matching. -l --ignore-whitespace Ignore white space changes between patch and input. -c --context Interpret the patch as a context difference. -e --ed Interpret the patch as an ed script. -n --normal Interpret the patch as a normal difference. -u --unified Interpret the patch as a unified difference. -N --forward Ignore patches that appear to be reversed or already applied. -R --reverse Assume patches were created with old and new files swapped. -i PATCHFILE --input=PATCHFILE Read patch from PATCHFILE instead of stdin. -o FILE --output=FILE Output patched files to FILE. -r FILE --reject-file=FILE Output rejects to FILE. -D NAME --ifdef=NAME Make merged if-then-else output using NAME. --merge Merge using conflict markers instead of creating reject files. -E --remove-empty-files Remove output files that are empty after patching. -Z --set-utc Set times of patched files, assuming diff uses UTC (GMT). -T --set-time Likewise, assuming local time. --quoting-style=WORD output file names using quoting style WORD. Valid WORDs are: literal, shell, shell-always, c, escape. Default is taken from QUOTING_STYLE env variable, or 'shell' if unset.Backup and version control options: -b --backup Back up the original contents of each file. --backup-if-mismatch Back up if the patch does not match exactly. --no-backup-if-mismatch Back up mismatches only if otherwise requested. -V STYLE --version-control=STYLE Use STYLE version control. STYLE is either 'simple', 'numbered', or 'existing'. -B PREFIX --prefix=PREFIX Prepend PREFIX to backup file names. -Y PREFIX --basename-prefix=PREFIX Prepend PREFIX to backup file basenames. -z SUFFIX --suffix=SUFFIX Append SUFFIX to backup file names. -g NUM --get=NUM Get files from RCS etc. if positive; ask if negative. -t --batch Ask no questions; skip bad-Prereq patches; assume reversed. -f --force Like -t, but ignore bad-Prereq patches, and assume unreversed. -s --quiet --silent Work silently unless an error occurs. --verbose Output extra information about the work being done. --dry-run Do not actually change any files; just print what would happen. --posix Conform to the POSIX standard. -d DIR --directory=DIR Change the working directory to DIR first. --reject-format=FORMAT Create 'context' or 'unified' rejects. --binary Read and write data in binary mode. --read-only=BEHAVIOR How to handle read-only input files: 'ignore' that they are read-only, 'warn' (default), or 'fail'. -v --version Output version info.Report bugs to <bug-patch@gnu.org>.��s6�����������s6��s6��s6��s6��s6��s6��s6�����s6��s6��s6�����s6�����s6�����s6��s6��g��[��s6��s6��s6��s6��s6��s6��s6�����L��������� ��s6��� ��s6��s6��� ��e ��V ��> �� ��s6�� ��������������s6�����s6�����s6��s6��s6��s6��s6������������6�����������a��7�� ��� �����b3��b3��b3��b3��b3��b3��b3��b3��b3��b3��b3��b3��b3��b3��b3��b3��b3��b3��b3��b3��b3��������b3��b3��b3��b3��b3��b3��b3��b3��������b3�����b3��b3��b3��b3��b3��b3��b3��b3��b3��b3��b3��b3��b3��b3��b3��,��apply_hunkoutput_file_nowbB:cd:D:eEfF:g:i:lnNo:p:r:RstTuvV:x:Y:z:Z #endif
#else
#ifndef %s
#ifdef %s malformed patch at line %s: %spatch unexpectedly ends in middle of line The next patch%s would %s the file %s, which %s!e69de29bb2d1d6434b8b29ae775ad8c2e48c5391missing line number at line %s: %sline number %.*s is too large at line %s: %sIgnoring potentially dangerous file name %s unexpected end of file in patchunterminated hunk starting at line %s; giving up at line %s: %sunexpected end of hunk at line %sunexpected '***' at line %s: %s%s '---' at line %s; check line numbers at line %sduplicate '---' at line %s; check line numbers at line %sno '---' found in patch at line %scontext mangled in hunk at line %sreplacement text or line numbers mangled in hunk at line %sthe telltale extra asterisks on the *** line that usually indicate(Fascinating -- this is really a new-style context diff but withoutfillsrc %s, filldst %s, rb %s, e+1 %s fillsrc==p_end+1 || fillsrc==repl_beginningfilldst==p_end+1 || filldst==repl_beginningunexpected end of file in patch at line %s'<' followed by space or tab expected at line %s of patch'---' expected at line %s of patch'>' followed by space or tab expected at line %s of patchNot enough memory to swap next hunk! Prereq: with multiple words at line %s of patch Cannot %s file without two valid file names I can't seem to find a patch in there anywhere. Ignoring the trailing garbage. done Perhaps you should have used the -p or --strip option? Perhaps you used the wrong -p or --strip option? Only garbage was found in the patch input.(Patch is indented %lu space%s.) (Stripping trailing CRs from patch; use --binary to disable.) can't find file to patch at input line %s The text leading up to this was: -------------------------- No file to patch. Skipping patch. Can't rewind to the beginning of file %soutname[0] != '!' && outname[0] != '-'/.//does not existdeletealready existscreateis already emptyempty out, when reversed,pch.cp_line && p_len && p_CharCan't open patch file %sfstatw+bp_Char[0] == '='tp_char[0] == '*'i == p_ptrn_lines + 1PrematureOverduep_end == -1********p_end < hunkmax0,0the new style...)%s %s %s *** %s,%s **** --- %s,%s ---- *** %s,%s --- %s,%s p_end + 1 < hunkmax%s %c |copyrename+++ Index:Prereq:diff --git index old mode new mode deleted file mode new file mode rename from rename to copy from copy to GIT binary patch--- < > a new-style context diffa unified diffa normal diffa git binary diffa context diffan ed scriptThe next patch ldone Hmm... %sooks like %s to me... p_base <= file_pos-------------------------- File to patch: Skip this patch? [y] w q Can't fork%s FAILEDcan't open '%s'tH���H��tH��tH���H���H���H���H��tH���H���H���H���H���H���H���H���H���H��I���i���i��k��k��k��k��k��k��k��k��k��k��k��k��k��k��k��k��k��k��k��k��k��pj��hg��k��k��k��k��k��k��k��k��h��hg��k��Oe��/usr/bin/eddo_ed_scriptpch_swapgrow_hunkmaxanother_hunkskip_tosafe.clist_empty (&dir->lru_link)Resolving path "%.*s" (failed) (cached) (%u miss%s) hash_insert (cached_dirfds, entry) == entryinsert_cached_dirfdtraverse_nextutil.c*s == '"'./RCSSCCSClearCasePerforce%s/RCS/%s%sRCS/%sSCCS/%s%s%s@@P4USERP4CONFIGP4PORT%s: **** out of memoryownerowning groupFailed to set the %s of %s %sread errorwrite errorCan't reopen file %sCopying %s %s to %s Can't read %s %sCan't create %s %sS_ISREG (mode)File %s already seen Creating empty file %s Can't close file %sRenaming file %s to %s Can't rename file %s to %s/dev/ttyEOFtty read failed Ignoring -R. Assuming -R. Ignore -R? [n] Assume -R? [n] Skipping patch. Applying it anyway. Apply anyway? [n] + %s with lockGet file %s from %s%s? [y] Getting file %s from %s%s... Can't get file %s from %sRemoved empty directory %s fetchname %s %d fseek/tmp%s/%s.%cXXXXXXTMPDIRTMPTEMP%s/p%cXXXXXXCan't remove file %sRemoving file %s ʴ�����������������������������������������`���`���`���`���������������������������������������������������������������������������������������������������������������������������ʴ��������������������������������������������������������е��������������������P���parse_c_stringcopy_file p4 edit cleartool co -unr -nc |diff - %sget -p get -e get s.rcsdiff %sco -l %sco %s,v/dev/nullFailed to set the timestamps of %s %sFailed to set the permissions of %s %sCan't set security context on file %sFile %s is not a %s -- refusing to create backupcan't do dry run on nonexistent version-controlled file %s; invoke '%s' and try againignoring malformed filename %s 2.7.6GNU patch%s %s %s
%s
%s Written by Larry Wall and Paul EggertLicense GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>. This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law.Copyright (C) 2003, 2009-2012 Free Software Foundation, Inc. Copyright (C) 1988 Larry WallHunk #%d %s at , %s at %s-%smerge.c |%.*soldin[in] == ' 'mergedpch_char (new) == ' 'already appliedNOT MERGED <<<<<<<
|||||||
=======
>>>>>>> last_frozen_line == where - 1pch_char (firstnew + 1) == '^'locating merge: min=%s max=%s where=%s matched=%s changes=%s pch_char (old) == '=' && pch_char (new) == '^'((pch_char (old) == ' ' && pch_char (new) == ' ') || (pch_char (old) == '=' && pch_char (new) == '^')) && ((oldin[old] == ' ' && oldin[in] == ' ') || (oldin[old] == '=' && oldin[in] == '^'))merge_hunkinvalid argument %s for %sambiguous argument %s for %sValid arguments are: - %s, %s~noneoffsimpleneverexistingnilnumbered# entries: %lu # buckets: %lu max bucket length: %lu # buckets used: %lu (%.2f%%) �?��L?�?���=fff?�̌?�?��L?�__Y@%c%02d-%02d%02ddate: %+ld %sGMTWETparsed %s part: today/this/now year(s)month(s)day(s)hour(s)minutesnanoseconds(Y-M-D) %Y-%m-%d %H:%M:%S TZ=%s DST UTC%s(Y-M-D) %04ld-%02ld-%02ldyear: %04ld %02ld:%02ld:%02ld.%09dpm isdst=%d%snumber of seconds: %ldAMJANUARYYEARTOMORROWerror: unknown word '%s' number of secondsdatetimelocal_zonedatedayrelativehybriderror: parsing failed amincorrect timezonemissing timezoneTZ="input timezone: '@timespec' - always UTCparsed date/time stringTZ="%s" in date stringUTC0TZ="%s" environment valuesystem default, dst (%s)error: out-of-range year %ld error: invalid hour %ld%s %02d:%02d:%02derror: tzalloc ("%s") failed user provided time: '%s' normalized time: '%s' possible reasons: %s new start date: '%s' is '%s' (Y-M-D) %s-%02d-%02dstarting date/time: '%s' parse-datetime.yerror: %s:%d new date/time = '%s' '%s' = %ld epoch-seconds timezone: system default timezone: Universal Time final: %s (UTC) final: %s (UTC%s) QUVWESTBSTARTBRTBRSTNSTNDTCLTCLSTEDTCSTCDTMSTMDTPSTPDTAKSTAKDTHSTHASTHADTSSTWATCETCESTMETMEZMESTMESZEETEESTCATSASTEATMSKMSDISTSGTJSTGSTNZSTNZDTUTYESTERDAYTODAYNOWLASTTHISNEXTFIRSTTHIRDFOURTHFIFTHSIXTHSEVENTHEIGHTHNINTHTENTHELEVENTHTWELFTHAGOHENCEMONTHFORTNIGHTWEEKHOURMINUTEMINSECONDSECFEBRUARYMARCHAPRILMAYJUNEJULYAUGUSTSEPTEMBERSEPTOCTOBERNOVEMBERDECEMBERSUNDAYMONDAYTUESDAYTUESWEDNESDAYWEDNESTHURSDAYTHURTHURSFRIDAYSATURDAYA.M.PMP.M.%s (day ordinal=%ld number=%d)warning: value %ld has %ld digits. Assuming YYYY/MM/DD warning: value %ld has less than 4 digits. Assuming MM/DD/YY[YY] error: parsing failed, stopped at '%s' using specified time as starting value: '%s' using current time as starting value: '%s' TZ="UTC0" environment value or -uerror: seen multiple time parts error: seen multiple date parts error: seen multiple days parts error: seen multiple daylight-saving parts error: seen multiple time-zone parts warning: adjusting year value %ld to %ld error: year, month, or day overflow warning: using midnight as starting time: 00:00:00 error: invalid date/time value: %4s %2s %2s %2s %2s %2s non-existing due to daylight-saving time; invalid day/month combination; numeric values overflow; error: day '%s' (day ordinal=%ld number=%d) resulted in an invalid date: '%s' using current date as starting value: '%s' warning: day (%s) ignored when explicit dates are given warning: when adding relative months/years, it is recommended to specify the 15th of the months warning: when adding relative days, it is recommended to specify noon error: adding relative date resulted in an invalid date: '%s' after date adjustment (%+ld years, %+ld months, %+ld days), warning: daylight saving time changed after date adjustment warning: month/year adjustment resulted in shifted dates: adjusted Y M D: %s %02d %02d normalized Y M D: %s %02d %02d error: timezone %d caused time_t overflow error: adding relative time caused an overflow after time adjustment (%+ld hours, %+ld minutes, %+ld seconds, %+d ns), new time = %ld epoch-seconds warning: daylight saving time changed after time adjustment timezone: TZ="%s" environment value final: %ld.%09d (epoch-seconds) �9��?N��?N��!9��R=���<��oC��C���B��dB��B���A��?N��?N��|A��7A���E��?N��yE��JF��F��?N��?N���5���H��sH��kH��KH��>H��FG���F���<���<���<��`<��Z<��+<���?��`?��"?��k.���>���>���>��V>��?N��E���C��"4��"4��E>��>���=���=���8���8��_8���7���7���7��C7���6���6���6��W6��F6��6��5��5��A��?N���;���;��B;��;���:���:���:��?N��?N��?N��~:��?N��_:��:���?���F���5��SunMonTueWedThuFriSatlastthisnext/first(SECOND)thirdfourthfifthsixthseventheightninthtentheleventhtwelfth !"####$$$%%&''((((((())))*********+,,,---------------------....../0011223455 fp