This is the mail archive of the frysk@sourceware.org mailing list for the frysk project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

This diff a bit weird Re: [SCM] frysk system monitor/debugger branch, master, updated. 6c1b2134a1081b7d65f0656fcc13a9ae85d964f9


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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]