Return-Path: <tiff-bounces@lists.maptools.org>
Received: from inas010.isp.belgacom.be (localhost [127.0.0.1])
        by inav021.isp.belgacom.be (8.12.11.20060308/8.12.11/Skynet-IN-AV-3.00) with ESMTP id k9CDsZCn009909
        for <joris.at.lebbeke@skynet.be>; Thu, 12 Oct 2006 15:54:35 +0200
        (envelope-from <tiff-bounces@lists.maptools.org>)
Received: from inmx017.isp.belgacom.be (inmx017.isp.belgacom.be [195.238.4.129])
        by inas010.isp.belgacom.be (8.12.11.20060308/8.12.11/Skynet-IN-AS-2.03) with ESMTP id k9CDsRMl022721
        for <joris.at.lebbeke@skynet.be>; Thu, 12 Oct 2006 15:54:29 +0200
        (envelope-from <tiff-bounces@lists.maptools.org>)
Received: from duke.maptools.org (r153.dmsolutions.ca [209.217.116.153] (may be forged))
        by inmx017.isp.belgacom.be (8.12.11.20060308/8.12.11/Skynet-IN-2.32) with ESMTP id k9CDsHbj013224
        for <joris.at.lebbeke@skynet.be>; Thu, 12 Oct 2006 15:54:19 +0200
        (envelope-from <tiff-bounces@lists.maptools.org>)
Received: from duke.maptools.org (duke.maptools.org [127.0.0.1])
	by duke.maptools.org (8.12.11/8.12.10) with ESMTP id k9CDfc2J022231;
	Thu, 12 Oct 2006 09:41:55 -0400
Received: from fmmailgate04.web.de (fmmailgate04.web.de [217.72.192.242])
	by duke.maptools.org (8.12.11/8.12.10) with ESMTP id k9CDfb3p022228
	for <tiff@lists.maptools.org>; Thu, 12 Oct 2006 09:41:37 -0400
Reveived: from web.de 
	by fmmailgate04.web.de (Postfix) with SMTP id 9A4BA262646;
	Thu, 12 Oct 2006 15:41:14 +0200 (CEST)
Received: from [84.159.40.44] by freemailng0204.web.de with HTTP;
	Thu, 12 Oct 2006 15:41:13 +0200
Date: Thu, 12 Oct 2006 15:41:13 +0200
Message-Id: <1254383889@web.de>
MIME-Version: 1.0
From: =?iso-8859-15?Q?Sebastian_B=F6hmer?= <Sebastian.Boehmer@web.de>
To: Anurag Singh <contact.anurag@gmail.com>,
        Sebastian Boehmer <sebastian.boehmer@web.de>
Subject: Re: [Tiff] Handling Of SubIFD in Libtiff Ver 3.8.3
Precedence: fm-user
Organization: http://freemail.web.de/
Content-Type: text/plain; charset=iso-8859-15
Content-Transfer-Encoding: 7bit
Cc: Tiff <tiff@lists.maptools.org>
X-BeenThere: tiff@lists.maptools.org
X-Mailman-Version: 2.1.4
List-Id: TIFF and libtiff discussion <tiff.lists.maptools.org>
List-Unsubscribe: <http://lists.maptools.org/mailman/listinfo/tiff>,
	<mailto:tiff-request@lists.maptools.org?subject=unsubscribe>
List-Archive: <http://lists.maptools.org/mailman/private/tiff>
List-Post: <mailto:tiff@lists.maptools.org>
List-Help: <mailto:tiff-request@lists.maptools.org?subject=help>
List-Subscribe: <http://lists.maptools.org/mailman/listinfo/tiff>,
	<mailto:tiff-request@lists.maptools.org?subject=subscribe>
Sender: tiff-bounces@lists.maptools.org
Errors-To: tiff-bounces@lists.maptools.org
X-UIDL: 000000000023ceae.00001bc3
X-MSP-STORE: Thu, 12 Oct 2006 15:54:38 +0200
Status:   

Could you please send us the full output? Or was this all under windows :-).
I used patch -p1 - a linux tool - to test the merging with the actual libtiff cvs version.

the code lines are under linux:
$ cvs checkout libtiff
$ gunzip libtiff-cvs-20061010-add_private_sub_IFD_support.patch.gz
$ cd libtiff
$ patch -p1 < ../libtiff-cvs-20061010-add_private_sub_IFD_support.patch
file .. patched
...
$./configure
$ make 

.. be happy ;-)

For TortoisesSVN I didn't know if the diff file is the correct format. The diff file was created with -urNp attributes.

Perhapse you have a linux box (Knopix) to grab it.

--
good luck, Sebastian
PS: I also compiled it with Visual Studio 2003.


> Dear all
>
> I have downloaded the patch file from bugzilla 1320, i am using TortoiseSVN 1.1.1 but i am not able to merge, it says that The line "index:" was not found.
>
> Might be that diff or patch file is generated by some other software, so that svn is not recognise it. Please any one suggest me that how can i merge this patch in version libtiff 3.8.2. Or Is there any other option to get  fully updated ( with all patches) code of libtiff. 
> 
> Thanks
> Anurag Singh
 

_____________________________________________________________________
Der WEB.DE SmartSurfer hilft bis zu 70% Ihrer Onlinekosten zu sparen!
http://smartsurfer.web.de/?mc=100071&distributionid=000000000066

_______________________________________________
Tiff mailing list: Tiff@lists.maptools.org
http://lists.maptools.org/mailman/listinfo/tiff
http://www.remotesensing.org/libtiff/
