From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S264017AbTDOAfq (for ); Mon, 14 Apr 2003 20:35:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S264018AbTDOAfq (for ); Mon, 14 Apr 2003 20:35:46 -0400 Received: from nat-pool-rdu.redhat.com ([66.187.233.200]:57453 "EHLO devserv.devel.redhat.com") by vger.kernel.org with ESMTP id S264017AbTDOAfp (for ); Mon, 14 Apr 2003 20:35:45 -0400 Date: Mon, 14 Apr 2003 20:47:33 -0400 From: Pete Zaitcev Message-Id: <200304150047.h3F0lXc22483@devserv.devel.redhat.com> To: Eli Carter cc: linux-kernel@vger.kernel.org Subject: Re: [OT] patch splitting util(s)? In-Reply-To: References: <3E9B2C38.4020405@inet.com> <20030414215128.GA24096@suse.de> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org >> > I didn't have much luck with googling. I think the words I used are too >> > generic. :/ >> >> Google for diffsplit. Its part of Tim Waugh's patchutils. >> Patchutils should be part of pretty much every distro these days too. > > I'm aware of patchutils. (Check the 0.2.22 Changelog ;) ) However, > splitdiff doesn't do what I'm after, from my initial look. Though now > that I think about it, it suggests an alternative solution. A > 'shatterdiff' that created one diff file per hunk in a patch would give > me basically what I want. I moaned at Tim until he caved in and added an '-s' option couple of weeks ago. It should be in a fresh rawhide srpm. Mind, you can do what you want even now, with -n (for line numbers) and a little bit of sh or perl, but all concievable solutions require several passes over the diff, which gets tiresome if you diff 2.4.9 (RH 7.2) and 2.4.18 (RH 8.0). The -s option does it in one pass. -- Pete