[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[cp-patches] Please be careful with the ChangeLog file
From: |
Mark Wielaard |
Subject: |
[cp-patches] Please be careful with the ChangeLog file |
Date: |
Sun, 07 Nov 2004 22:43:18 +0100 |
Hi,
When there are so many patches going in it is easy to mess up the
ChangeLog file since you are more likely to get a cvs merge conflict.
Please, check carefully before you check in.
Attached is a patch to fixup the ChangeLog file since it had a conflict
marker and one of the entries disappeared.
And thanks for working so hard to make this a problem in the first
place. We are doing 300+ SLOC each and every day now!
Cheers,
Mark
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2753
diff -u -r1.2753 ChangeLog
--- ChangeLog 7 Nov 2004 20:27:47 -0000 1.2753
+++ ChangeLog 7 Nov 2004 21:34:33 -0000
@@ -217,6 +217,16 @@
java/awt/image/LookupOp.java,
java/awt/image/ConvolveOp.java: New classes.
+2004-11-06 Andrew Haley <address@hidden>
+
+ * java/io/ObjectInputStream.java
+ (readObject): ENDBLOCKDATA is generated if the class has a write
+ method, not if it has a read method.
+
+2004-11-06 Mark Wielaard <address@hidden>
+
+ * java/util/Vector.java (readObject): Removed.
+
2004-11-06 Tom Tromey <address@hidden>
* gnu/java/net/protocol/http/Connection.java (sendRequest): Fix
@@ -326,7 +336,6 @@
(set(int,int)): Set and use new field.
(set(int,int,int)): Check new field.
->>>>>>> 1.2751
2004-10-29 Jerry Quinn <address@hidden>
* java/awt/image/ColorConvertOp.java: New class.
signature.asc
Description: This is a digitally signed message part
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [cp-patches] Please be careful with the ChangeLog file,
Mark Wielaard <=