Merge != overwrite

Date view Thread view Subject view Author view

From: Archie Cobbs (archie@whistle.com)
Date: Wed Dec 09 1998 - 18:01:00 EST

Tim,
Looks like your merge blew away some fixes (again!).
For example:

$ cvs diff -u -r 1.6 -r 1.7 Long.java | t
Index: Long.java
===================================================================
RCS file: /home/cvspublic/kaffe/libraries/javalib/java/lang/Long.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Long.java 1998/12/08 17:15:12 1.6
+++ Long.java 1998/12/09 23:20:18 1.7
@@ -139,15 +139,15 @@
 }
 
 public static String toBinaryString ( long i ) {
- return toUnsignedString(i, 1);
+ return toUnsignedString(i, 2);
 }
 
 public static String toHexString ( long i ) {
- return toUnsignedString(i, 4);
+ return toUnsignedString(i, 16);
 }
 
 public static String toOctalString ( long i ) {
- return toUnsignedString(i, 3);
+ return toUnsignedString(i, 8);
 }
 
 public String toString() {

You guys need a better system than this I think.

-Archie

___________________________________________________________________________
Archie Cobbs * Whistle Communications, Inc. * http://www.whistle.com

Date view Thread view Subject view Author view

This archive was generated by hypermail 2b29 : Sat Sep 23 2000 - 19:57:09 EDT