From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19124 invoked by alias); 7 Oct 2009 03:57:53 -0000 Received: (qmail 19115 invoked by uid 22791); 7 Oct 2009 03:57:52 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from relay2.ptmail.sapo.pt (HELO relay2.ptmail.sapo.pt) (212.55.154.22) by sourceware.org (qpsmtpd/0.43rc1) with SMTP; Wed, 07 Oct 2009 03:57:44 +0000 Received: (qmail 15576 invoked from network); 7 Oct 2009 03:57:42 -0000 Received: from unknown (HELO sapo.pt) (10.134.37.165) by relay2 with SMTP; 7 Oct 2009 03:57:42 -0000 Received: (qmail 25665 invoked from network); 7 Oct 2009 03:57:42 -0000 X-Scan-Status: AV clean (0.03261 seconds); AS clean (0.43847 seconds); Received: from unknown (HELO [192.168.0.12]) (sergiomb@sapo.pt@[213.22.108.231]) (envelope-sender ) by mta15 (qmail-ldap-1.03) with AES256-SHA encrypted SMTP for ; 7 Oct 2009 03:57:41 -0000 Subject: Re: Support for index data by splitdiff command From: Sergio Monteiro Basto To: patchutils-list@sourceware.org Cc: Markus Elfring In-Reply-To: <1254885773.10925.ezmlm@sourceware.org> References: <1254885773.10925.ezmlm@sourceware.org> Content-Type: multipart/signed; micalg="sha1"; protocol="application/x-pkcs7-signature"; boundary="=-W6fQe45EULS1mQJiPaIk" Date: Wed, 07 Oct 2009 03:57:00 -0000 Message-Id: <1254887860.2321.54.camel@segulix> Mime-Version: 1.0 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: 2009-q4/txt/msg00001.txt.bz2 --=-W6fQe45EULS1mQJiPaIk Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Content-length: 2759 Hi sorry for the SPAM , my fault , elmz is too ... , last try ( I promise := ))=20 Hi,=20 Don't know if it help, I use svn and I use filterdiff. filterdiff cleans all things that don't belongs to patch and that includes Index ... If you just want a clean splitdiff, you may use :=20 svn diff | filterdiff > txt; splitdiff -a txt On Wed, 2009-10-07 at 03:22 +0000, patchutils-list-help@sourceware.org wrote: > Hello, >=20=20=20=20=20=20=20=20=20 > I would like to point out an open issue for the tool > "splitdiff" from the software package "patchutils 0.3.0-1.52". >=20=20=20=20=20=20=20=20=20 > A special header "Index:" is mentioned in the article > "http://en.wikipedia.org/wiki/Diff". Tools like Subversion > write it into difference files. The current command does not > handle this data correctly. >=20=20=20=20=20=20=20=20=20 > The following input ... >=20=20=20=20=20=20=20=20=20 > Index: abc.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- abc.h (Revision 123) > +++ abc.h (work copy) > @@ -1,1 +1,1 @@ > -check > +out > Index: xyz.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- xyz.h (Revision 987) > +++ xyz.h (work copy) > @@ -1,1 +1,1 @@ > -test > +this >=20=20=20=20=20=20=20=20=20 > ... is converted into the following arrangement by "splitdiff > -a". >=20=20=20=20=20=20=20=20=20 > First source file: > --- abc.h (Revision 123) > +++ abc.h (work copy) > @@ -1,1 +1,1 @@ > -check > +out > Index: xyz.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >=20=20=20=20=20=20=20=20=20 > Second source file: > --- xyz.h (Revision 987) > +++ xyz.h (work copy) > @@ -1,1 +1,1 @@ > -test > +this >=20=20=20=20=20=20=20=20=20 >=20=20=20=20=20=20=20=20=20 > I would appreciate if the first file will keep its own header > and will not additionally get informations from the second > file. >=20=20=20=20=20=20=20=20=20 > Regards, > Markus --=20 S=C3=A9rgio M. B. --=-W6fQe45EULS1mQJiPaIk Content-Type: application/x-pkcs7-signature; name="smime.p7s" Content-Disposition: attachment; filename="smime.p7s" Content-Transfer-Encoding: base64 Content-length: 2973 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEH AQAAoIIGVjCCAw8wggJ4oAMCAQICEA6CVh3keQ8TFtyrh/wrbgYwDQYJKoZI hvcNAQEFBQAwYjELMAkGA1UEBhMCWkExJTAjBgNVBAoTHFRoYXd0ZSBDb25z dWx0aW5nIChQdHkpIEx0ZC4xLDAqBgNVBAMTI1RoYXd0ZSBQZXJzb25hbCBG cmVlbWFpbCBJc3N1aW5nIENBMB4XDTA4MTAxNDAzMTc0N1oXDTA5MTAxNDAz MTc0N1owSzEfMB0GA1UEAxMWVGhhd3RlIEZyZWVtYWlsIE1lbWJlcjEoMCYG CSqGSIb3DQEJARYZc2VyZ2lvQHNlcmdpb21iLm5vLWlwLm9yZzCCASIwDQYJ KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ2DrpizYnrRUFYQm6b6ZcE50ta3 6mutS13FIAqg0ugCjlSFSv+nkjbfEBOug+hb5vh9SOBOLy+UFJrn2MibIuLG ip4OsawcJ41Z7prkKlUCIwtNLmb/m7swubSLqFRiojy0ctMhMWtDt9xzwOYm ZN7yGMiSjFHivrtZRGPWA7tPzN3KOQeSP4DYxLZ06a3ZOwqR4g3NkQeWbdLV vBe6r3mKtaoDeirW5XT8epyhvqRK7izl/vOum2Gx+HeaLpyH5pTOhMd2K7DT fMiBjqBxchUDTccOykMN+5i9ketxy3Bh0PfEStZhvjaZbCsJIV2WQc/jAH+k 3xef41fci2o+Cz0CAwEAAaNZMFcwDgYDVR0PAQH/BAQDAgSQMBEGCWCGSAGG +EIBAQQEAwIFoDAkBgNVHREEHTAbgRlzZXJnaW9Ac2VyZ2lvbWIubm8taXAu b3JnMAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADgYEAABP+jrmaOnO/ 2yM7OeJmjEVjDJpT2baLpvBL1k4O6HSVgsx5JidSa+vF/cKaP1UFko8XT2To oDpnrTbw//Rkfd6ZbeXXqzdIJQs4xiSRGgcMuJL8GtuHLQHkOIqKaPW+KSzV G68U/NzSzqdtr5iPwE6YCLMN0WnVduhgLQlXqkAwggM/MIICqKADAgECAgEN MA0GCSqGSIb3DQEBBQUAMIHRMQswCQYDVQQGEwJaQTEVMBMGA1UECBMMV2Vz dGVybiBDYXBlMRIwEAYDVQQHEwlDYXBlIFRvd24xGjAYBgNVBAoTEVRoYXd0 ZSBDb25zdWx0aW5nMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2Vz IERpdmlzaW9uMSQwIgYDVQQDExtUaGF3dGUgUGVyc29uYWwgRnJlZW1haWwg Q0ExKzApBgkqhkiG9w0BCQEWHHBlcnNvbmFsLWZyZWVtYWlsQHRoYXd0ZS5j b20wHhcNMDMwNzE3MDAwMDAwWhcNMTMwNzE2MjM1OTU5WjBiMQswCQYDVQQG EwJaQTElMCMGA1UEChMcVGhhd3RlIENvbnN1bHRpbmcgKFB0eSkgTHRkLjEs MCoGA1UEAxMjVGhhd3RlIFBlcnNvbmFsIEZyZWVtYWlsIElzc3VpbmcgQ0Ew gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMSmPFVzVftOucqZWh5owHUE cJ3f6f+jHuy9zfVb8hp2vX8MOmHyv1HOAdTlUAow1wJjWiyJFXCO3cnwK4Va qj9xVsuvPAsH5/EfkTYkKhPPK9Xzgnc9A74r/rsYPge/QIACZNenprufZdHF KlSFD0gEf6e20TxhBEAeZBlyYLf7AgMBAAGjgZQwgZEwEgYDVR0TAQH/BAgw BgEB/wIBADBDBgNVHR8EPDA6MDigNqA0hjJodHRwOi8vY3JsLnRoYXd0ZS5j b20vVGhhd3RlUGVyc29uYWxGcmVlbWFpbENBLmNybDALBgNVHQ8EBAMCAQYw KQYDVR0RBCIwIKQeMBwxGjAYBgNVBAMTEVByaXZhdGVMYWJlbDItMTM4MA0G CSqGSIb3DQEBBQUAA4GBAEiM0VCD6gsuzA2jZqxnD3+vrL7CF6FDlpSdf0wh uPg2H6otnzYvwPQcUCCTcDz9reFhYsPZOhl+hLGZGwDFGguCdJ4lUJRix9sn cVcljd2pnDmOjCBPZV+V2vf3h9bGCE6u9uo05RAaWzVNd+NWIXiC3CEZNd4k sdMdRv9dX2VPMYIB/DCCAfgCAQEwdjBiMQswCQYDVQQGEwJaQTElMCMGA1UE ChMcVGhhd3RlIENvbnN1bHRpbmcgKFB0eSkgTHRkLjEsMCoGA1UEAxMjVGhh d3RlIFBlcnNvbmFsIEZyZWVtYWlsIElzc3VpbmcgQ0ECEA6CVh3keQ8TFtyr h/wrbgYwCQYFKw4DAhoFAKBdMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEw HAYJKoZIhvcNAQkFMQ8XDTA5MTAwNzAzNTc0MFowIwYJKoZIhvcNAQkEMRYE FAuFhpXSuN0WiZYrcBsMb12IUijuMA0GCSqGSIb3DQEBAQUABIIBAGxUvzv2 ziGmBBnd9+N7GD7IRMis60koEABbgiOfFXF8E3v5MlZfCPz1wg0dAhKgcJz4 NG/4kt7WRcpaTWc8svo2jwLNjignruAgeaVcFpzctJTvB2/nAFJ1md4mBzA2 Ld6mHBcMZwKJsDYw2+g7DOoSQDXJr/ozaVe3EEAxu5ek8eImLtL3ZbqPJ98u sFyFkHNtddBLqeMOAA/dQd5KsOzyLOJlytpM2eKKwbuA8uvACM2sUfklWAs1 xjXV6CMq7im3Z3s67CYXoD+7WRWAm+6Pq6xDtQ0wL7Xi8NypxW/jGIA8iew2 +EvZYCpb4RnY2ZsJEwZ1HFjKPm1xNFKki8EAAAAAAAA= --=-W6fQe45EULS1mQJiPaIk--