How to resolve hiccups by patch program?

Markus Elfring Markus.Elfring@web.de
Wed Jan 10 21:46:00 GMT 2007


> Does running d2u over the rejected hunk fix your problem?

No luck on my system ...

$ uname -a
CYGWIN_NT-5.1 sonne 1.5.23(0.156/4/2) 2006-12-19 10:52 i686 Cygwin

$ cd /cygdrive/e/Projekte/Asterisk/Probe
$ d2u -U app_db.c const4.patch.part010
app_db.c: done.
const4.patch.part010: done.

$ patch -l -r test8160.rej app_db.c const4.patch.part010
patching file app_db.c
Hunk #1 FAILED at 49.
1 out of 1 hunk FAILED -- saving rejects to file test8160.rej


> Does generating the patch by the commandline svn client under cygwin generate
> a patch in the correct format for the patch utility under cygwin?

$ cd /cygdrive/e/Projekte/Asterisk/8160/
$ svn --version
svn, version 1.4.2 (r22196)
   compiled Dec  2 2006, 14:28:55
[...]
$ svn update
Fetching external item into 'menuselect'

Fetching external item into 'menuselect/mxml'
External at revision 17.

At revision 100.
At revision 50443.

$ svn diff apps/app_db.c > ../Probe/try_const.diff
$ cd ../Probe/
$ patch -r test8160b.rej app_db.c try_const.diff
patching file app_db.c
Hunk #1 FAILED at 49.
1 out of 1 hunk FAILED -- saving rejects to file test8160b.rej


Which next steps do you imagine now?

Regards,
Markus

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Problem reports:       http://cygwin.com/problems.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/



More information about the Cygwin mailing list