From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7318 invoked by alias); 3 Jan 2007 12:43:39 -0000 Received: (qmail 7310 invoked by uid 22791); 3 Jan 2007 12:43:37 -0000 X-Spam-Status: No, hits=-2.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 03 Jan 2007 12:43:32 +0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id l03ChUAA030243; Wed, 3 Jan 2007 07:43:30 -0500 Received: from lacrosse.corp.redhat.com (lacrosse.corp.redhat.com [172.16.52.154]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l03ChUJm015744; Wed, 3 Jan 2007 07:43:30 -0500 Received: from [10.13.248.19] (vpn-248-19.boston.redhat.com [10.13.248.19]) by lacrosse.corp.redhat.com (8.12.11.20060308/8.11.6) with ESMTP id l03ChT7E024401; Wed, 3 Jan 2007 07:43:29 -0500 Subject: Re: How to resolve hiccups by patch program? From: Tim Waugh To: SF Markus Elfring Cc: patchutils-list@sourceware.org In-Reply-To: <1384971006@web.de> References: <1384971006@web.de> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-WRUK1xtFOcgw1MKKMiz+" Date: Wed, 03 Jan 2007 12:43:00 -0000 Message-Id: <1167828208.4565.5.camel@cyberelk.elk> Mime-Version: 1.0 X-Mailer: Evolution 2.8.2.1 (2.8.2.1-2.fc6) X-Virus-Checked: Checked by ClamAV on sourceware.org X-IsSubscribed: yes Mailing-List: contact patchutils-list-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: patchutils-list-owner@sourceware.org X-SW-Source: 2007-q1/txt/msg00001.txt.bz2 --=-WRUK1xtFOcgw1MKKMiz+ Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Content-length: 795 On Wed, 2007-01-03 at 11:47 +0100, SF Markus Elfring wrote: > I wish you a happy new year. And to you. > I ask because the technical details might be relevant for the open issue = "Improve const-correctness" (http://bugs.digium.com/view.php?id=3D8160) wit= h the Asterisk software. Would you like to share any more ideas for a solut= ion to the observed obstacle? > http://article.gmane.org/gmane.comp.version-control.subversion.tortoisesv= n.user/5180 I have yet to see a patch reject that was created by patch(1) without good reason. There are sure to be conflicts of some sort in the patch. If there are any conflicts at all, they need to be resolved by human intervention -- there is no other way to be sure that the patch may be applied without producing an incorrect result. Tim. */ --=-WRUK1xtFOcgw1MKKMiz+ Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part Content-length: 189 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQBFm6TwFLeBZ6VVmn8RAgvpAJ9T7y7FXw/gF79vle930ZFuxED+vwCfa3l1 +vre/BWosdiVs5r4s0sPz2c= =YpVW -----END PGP SIGNATURE----- --=-WRUK1xtFOcgw1MKKMiz+--