From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24011 invoked by alias); 6 Nov 2007 15:13:57 -0000 Received: (qmail 24003 invoked by uid 22791); 6 Nov 2007 15:13:57 -0000 X-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00,DK_POLICY_SIGNSOME,FORGED_RCVD_HELO,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; Tue, 06 Nov 2007 15:13:52 +0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.1) with ESMTP id lA6FDoI4002721 for ; Tue, 6 Nov 2007 10:13:50 -0500 Received: from pobox-2.corp.redhat.com (pobox-2.corp.redhat.com [10.11.255.15]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id lA6FDmwh022621; Tue, 6 Nov 2007 10:13:48 -0500 Received: from localhost.localdomain (vpn-6-43.fab.redhat.com [10.33.6.43]) by pobox-2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id lA6FDkws015511; Tue, 6 Nov 2007 10:13:47 -0500 Message-ID: <473084A9.60700@redhat.com> Date: Tue, 06 Nov 2007 15:13:00 -0000 From: Phil Muldoon User-Agent: Thunderbird 2.0.0.5 (X11/20070727) MIME-Version: 1.0 To: frysk@sourceware.org CC: timoore@redhat.com Subject: This diff a bit weird Re: [SCM] frysk system monitor/debugger branch, master, updated. 6c1b2134a1081b7d65f0656fcc13a9ae85d964f9 References: <20071106145806.11940.qmail@sourceware.org> In-Reply-To: <20071106145806.11940.qmail@sourceware.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-IsSubscribed: yes Mailing-List: contact frysk-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-owner@sourceware.org X-SW-Source: 2007-q4/txt/msg00108.txt.bz2 pmuldoon@sourceware.org wrote: Not sure what is going on here but: > The branch, master has been updated > via 6c1b2134a1081b7d65f0656fcc13a9ae85d964f9 (commit) > from 7c185652b3cca2ab1cbfeeb45482ec772d1b4c5b (commit) > > The diff below is diffing a new file (CorefileStatus.java) with an existing file (DeadHost.java): > diff --git a/frysk-core/frysk/proc/dead/DeadHost.java b/frysk-core/frysk/proc/dead/CorefileStatus.java > similarity index 88% > copy from frysk-core/frysk/proc/dead/DeadHost.java > copy to frysk-core/frysk/proc/dead/CorefileStatus.java > index 29a077e..b99e1fc 100644 > --- a/frysk-core/frysk/proc/dead/DeadHost.java > +++ b/frysk-core/frysk/proc/dead/CorefileStatus.java > @@ -33,20 +33,18 @@ > // this exception. If you modify this file, you may extend this > // exception to your version of the file, but you are not obligated to > // do so. If you do not wish to provide this exception without > -// modification, you must delete this exception statement from your > -// version and license this file solely under the GPL without > +// modification, you must delete this exception statement from your// version and license this file solely under the GPL without > // exception. > And so on. Maybe it was my commit, too? Regards Phil