X-Spam-Check-By:	sourceware.org
Message-ID:	<22728248.1168253857622.JavaMail.fmail@fmcert01.dlan.cinetic.de>
MIME-Version:	1.0
Date:	Mon, 08 Jan 2007 11:57:33 +0100
From:	Markus Elfring <Markus DOT Elfring AT web DOT de>
To:	bug-patch AT gnu DOT org, cygwin AT cygwin DOT com
Cc:	"Christopher R. Gabriel" <cgabriel AT softwarelibero DOT org>,
	Paul Eggert <eggert AT twinsun DOT com>
Subject:	How to resolve hiccups by patch program?
X-IsSubscribed:	yes
Mailing-List:	contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Id:	<cygwin.cygwin.com>
List-Subscribe:	<mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive:	<http://sourceware.org/ml/cygwin/>
List-Post:	<mailto:cygwin AT cygwin DOT com>
List-Help:	<mailto:cygwin-help AT cygwin DOT com>, <http://sourceware.org/ml/#faqs>
Sender:	cygwin-owner AT cygwin DOT com
Mail-Followup-To:	cygwin AT cygwin DOT com
Delivered-To:	mailing list cygwin AT cygwin DOT com

------=_Part_6723_12036617.1168253857621
Content-Type: text/plain; charset=iso-8859-15
Content-Transfer-Encoding: 7bit

Hello,

I published the file "const4.patch" (http://bugs.digium.com/file_download.php?file_id=12617&type=bug) to fix something for the issue "Improve const-correctness" (http://bugs.digium.com/view.php?id=8160). Unfortunately, some errors were reported for this patch file. There are parts that are acceptable as it can be seen from the log "bug 8160 const4 patch results.txt". So I extracted a conflicting part by the splitdiff command.

I've got this annoying issue with the tool (version 2.5.9):
$ patch -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

Why are the appropriate places for the intended updates not found in the source code?
Do I overlook anything from the specified rules that results into the unexpected mismatch?
http://opengroup.org/onlinepubs/007908799/xcu/patch.html#tag_001_014_1662_003

I assume that I am not affected by wrong line endings as it was suggested for the topic 'Is "Patch" broken?'.
http://sourceware.org/ml/cygwin/2004-04/msg00334.html

Is the conclusion from the topic "Where is patch?" relevant in my case?
http://sourceware.org/ml/cygwin/2005-12/msg00678.html

Would you like to share your ideas in other discussions?
http://thread.gmane.org/gmane.comp.version-control.subversion.tortoisesvn.user/5180/focus=5180
http://sources.redhat.com/ml/patchutils-list/2007-q1/index.html#00000

Regards,
Markus

------=_Part_6723_12036617.1168253857621
Content-Type: application/pkcs7-signature; name=smime.p7s; smime-type=signed-data
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="smime.p7s"
Content-Description: S/MIME Cryptographic Signature

MIAGCSqGSIb3DQEHAqCAMIACAQExDjAMBggqhkiG9w0CBQUAMIAGCSqGSIb3
DQEHAQAAoIID7TCCA+kwggLRoAMCAQICBAQwrlIwDQYJKoZIhvcNAQEEBQAw
gaAxCzAJBgNVBAYTAkRFMRIwEAYDVQQKEwlXRUIuREUgQUcxFTATBgNVBAsT
DFRydXN0IENlbnRlcjEaMBgGA1UEBxMRRC03NjIyNyBLYXJsc3J1aGUxLTAr
BgNVBAMTJFdFQi5ERSBUcnVzdENlbnRlciBFTWFpbC1aZXJ0aWZpa2F0ZTEb
MBkGCSqGSIb3DQEJARYMdHJ1c3RAd2ViLmRlMB4XDTA2MTEwOTEzMTMxMVoX
DTA3MTEwOTEzMTMxMVowXjEKMAgGA1UEBhMBRDERMA8GA1UEBxMITWVocmhv
b2cxFzAVBgNVBAMTDk1hcmt1cyBFbGZyaW5nMSQwIgYJKoZIhvcNAQkBFhVt
YXJrdXMuZWxmcmluZ0B3ZWIuZGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
AoGBALQirwzOds2RJ3FWVboXzFZ1yMIWZDUwYBRQbCAAXArzXoBCkm7SgETY
99z0bUHPZ+ExCGjSju812NvQaHvCvAmfgg9cpjyCY4wv82ikEuY7gdGIIWP3
l2VSkrTjblPzd3A72UcK6Kaeck9EUx7EV3+24XTUi7ODfT7tGsR+QkQlAgMB
AAGjge8wgewwHQYDVR0OBBYEFOicGjwMb3oq1lAff4rk8Nczhq6uMB8GA1Ud
IwQYMBaAFFpkzNcIjXxhAsbLkgPXwrr53rzUMAwGA1UdEwEB/wQCMAAwEQYJ
YIZIAYb4QgEBBAQDAgSwMCMGCWCGSAGG+EIBAgQWFhRodHRwczovL3RydXN0
LndlYi5kZTAaBglghkgBhvhCAQgEDRYLL0hpbGZlL0FHQi8wFgYJYIZIAYb4
QgEDBAkWBy9ydi8/cz0wFgYJYIZIAYb4QgEHBAkWBy9ybi8/cz0wGAYJYIZI
AYb4QgEEBAsWCS9ydkNBLz9zPTANBgkqhkiG9w0BAQQFAAOCAQEAF7ddQKVc
y2gtHzmuJY0Fx0omO5RM1qrsFXEBb/S/2PTV9gy6qYdLtUw7WVqwX2homLGF
dZHu6cxCPoki4ES1jLvMl1+E130iyuHM364x2rD4Hkvo86sTnNpWRK08ZqeQ
IBMlBAUn4kjQophTsgrxC416APUvjsJGvtnULtnsR1RDkv5JKdKbSxYfsrdH
6hro7wtx8CONlz5jKTAjU9As9JOPuTJ+HQsY7GoXoNuE/5Sgd1lSOBV0JUgF
S8Ixx8+XSGGZF2Dq/LlMcfdDuDNrkQSNZePERciCNUMVEsZgI6Pg13pXJ4sx
RCYUnQehzmdGl8t8uGhQgRbGI6a52/ZCzjGCArowggK2AgEBMIGpMIGgMQsw
CQYDVQQGEwJERTESMBAGA1UEChMJV0VCLkRFIEFHMRUwEwYDVQQLEwxUcnVz
dCBDZW50ZXIxGjAYBgNVBAcTEUQtNzYyMjcgS2FybHNydWhlMS0wKwYDVQQD
EyRXRUIuREUgVHJ1c3RDZW50ZXIgRU1haWwtWmVydGlmaWthdGUxGzAZBgkq
hkiG9w0BCQEWDHRydXN0QHdlYi5kZQIEBDCuUjAMBggqhkiG9w0CBQUAoIIB
YzAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0w
NzAxMDgxMDU3MzdaMB8GCSqGSIb3DQEJBDESBBBpdge/avEmsHzSU5RtKDyh
MEkGCSqGSIb3DQEJDzE8MDowCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCA
MA0GCCqGSIb3DQMCAgFAMA0GCCqGSIb3DQMCAgEoMIG8BgsqhkiG9w0BCRAC
CzGBrKCBqTCBoDELMAkGA1UEBhMCREUxEjAQBgNVBAoTCVdFQi5ERSBBRzEV
MBMGA1UECxMMVHJ1c3QgQ2VudGVyMRowGAYDVQQHExFELTc2MjI3IEthcmxz
cnVoZTEtMCsGA1UEAxMkV0VCLkRFIFRydXN0Q2VudGVyIEVNYWlsLVplcnRp
ZmlrYXRlMRswGQYJKoZIhvcNAQkBFgx0cnVzdEB3ZWIuZGUCBAQwrlIwDQYJ
KoZIhvcNAQEBBQAEgYA/+iNpi4Wb5kXoQZB3J8rAgzITcBSkXAl4pXJ7r5yM
Dwjx20CIYM/znFsX6Nfh+SrR4pPCHrNQnpT1hC4M6fpeS/3etyga9BPnU6s2
1m0ICmbnZl/FKixUZ67cv0QY74T5S9c6wLsSqKXIvkbmqCa5Loej+xVLfl8D
vHp5Ueg7fAAAAAAAAA==

------=_Part_6723_12036617.1168253857621--

- Raw text -