From owner-freebsd-questions@FreeBSD.ORG Fri Nov 2 01:31:10 2007 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E73B216A419 for ; Fri, 2 Nov 2007 01:31:09 +0000 (UTC) (envelope-from aryeh.friedman@gmail.com) Received: from wx-out-0506.google.com (wx-out-0506.google.com [66.249.82.231]) by mx1.freebsd.org (Postfix) with ESMTP id 4117F13C4AA for ; Fri, 2 Nov 2007 01:31:09 +0000 (UTC) (envelope-from aryeh.friedman@gmail.com) Received: by wx-out-0506.google.com with SMTP id i29so585426wxd for ; Thu, 01 Nov 2007 18:30:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:user-agent:mime-version:to:subject:content-type:content-transfer-encoding; bh=FfUxTLKs9p/V+em5kTFS/XLYvEDEZ3E3sa3e7c/S5Zk=; b=BNu/I6J+LX4qrX3kD4sdfsLZkLwgP6afpk/Qy1uDQxOGklmhiNn2hVeP0HaDbdsDkaSEs6xoEPaOx1kDCk+7XjjTuiGmCDwab9BWkqXmYWaINU2AcY75uBHdG9RhDfcN+AYvhcs38mOOcxpf2k8MvGRnCDBdtWbZawnbKe5WKoM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:user-agent:mime-version:to:subject:content-type:content-transfer-encoding; b=NA2h1uN3ein/fNTS2NxOJQxsOw4fe4lv3HUTJN897c/hp+C1sIr/V04wRkkv8AfdeiRQoFrmbPMTXN4+I5QKT6OP0gKH9TQqIGN3lnqGXpVplB14+fQsXaYdBKygx5uBv57Iw83lFO1hETD/LeSIAIncL70+u1rYLNYKv3JgkXo= Received: by 10.70.29.7 with SMTP id c7mr1690034wxc.1193966662685; Thu, 01 Nov 2007 18:24:22 -0700 (PDT) Received: from ?192.168.2.2? ( [67.85.89.184]) by mx.google.com with ESMTPS id m33sm3999447ele.2007.11.01.18.24.20 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 01 Nov 2007 18:24:21 -0700 (PDT) Message-ID: <472A43C1.40802@gmail.com> Date: Thu, 01 Nov 2007 21:23:13 +0000 From: "Aryeh M. Friedman" User-Agent: Thunderbird 2.0.0.6 (X11/20071031) MIME-Version: 1.0 To: freebsd-questions@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: help using patch X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2007 01:31:10 -0000 I have the following patch and the unpatched source code in rcsC0 no matter what command line I try for patch it fails.... any hints? diff -ruN rcsC0.new/src/app/rcs/core/Contribution.java rcsC0/src/app/rcs/core/Contribution.java --- rcsC0.new/src/app/rcs/core/Contribution.java 2007-10-27 22:48:56.000000000 -0400 +++ rcsC0/src/app/rcs/core/Contribution.java 2007-10-27 17:18:22.000000000 -0400 @@ -18,11 +18,6 @@ return share; } - public void setShare(double share) - { - this.share=share; - } - public String toString() { if(contributor instanceof Project) diff -ruN rcsC0.new/src/app/rcs/ui/cmdline/NewContributor.java rcsC0/src/app/rcs/ui/cmdline/NewContributor.java --- rcsC0.new/src/app/rcs/ui/cmdline/NewContributor.java 2007-10-27 22:52:34.000000000 -0400 +++ rcsC0/src/app/rcs/ui/cmdline/NewContributor.java 1969-12-31 19:00:00.000000000 -0500 @@ -1,38 +0,0 @@ -package app.rcs.ui.cmdline; - -import app.rcs.core.Contribution; -import app.rcs.core.DataBase; -import app.rcs.core.Project; -import app.rcs.core.ShareHolder; - -public class NewContributor -{ - public static void main(String[] args) - { - if(args.length!=4) { - System.out.println("Usage: newcontributor project contrib {prj|sh} rcs"); - System.exit(1); - } - - Project p=new Project(); - DataBase.load(p,args[0]); - - double rcs=new Double(args[3]); - double newRcs=1-rcs; - - for(Contribution contrib:p.getContributions ()) - contrib.setShare(contrib.getShare()*newRcs); - - ShareHolder sh=null; - - if(args[2].equals("prj")) { - DataBase.load((Project) sh,args[1]); - - if(sh==null) - sh=new Project(args[1]); - } else sh=new ShareHolder(args[1]); - - p.addContribution(new Contribution(sh,rcs)); - DataBase.save(p,p.getName()); - } -} diff -ruN rcsC0.new/src/app/rcs/ui/cmdline/NewProject.java rcsC0/src/app/rcs/ui/cmdline/NewProject.java --- rcsC0.new/src/app/rcs/ui/cmdline/NewProject.java 2007-10-27 22:36:02.000000000 -0400 +++ rcsC0/src/app/rcs/ui/cmdline/NewProject.java 1969-12-31 19:00:00.000000000 -0500 @@ -1,18 +0,0 @@ -package app.rcs.ui.cmdline; - -import app.rcs.core.DataBase; -import app.rcs.core.Project; - -public class NewProject -{ - public static void main(String[] args) - { - if(args.length!=1) { - System.out.println("Usage: newproject project"); - System.exit(1); - } - - Project p=new Project(args[0]); - DataBase.save(p,p.getName()); - } -} diff -ruN rcsC0.new/src/app/rcs/ui/cmdline/Payout.java rcsC0/src/app/rcs/ui/cmdline/Payout.java --- rcsC0.new/src/app/rcs/ui/cmdline/Payout.java 2007-10-27 22:29: 34.000000000 -0400 +++ rcsC0/src/app/rcs/ui/cmdline/Payout.java 2007-10-27 18:14:44.000000000 -0400 @@ -19,22 +19,6 @@ p.addValue(new Double(args[1])); p.payout(); - boolean done=false; - while(!done) { - done=true; - - for(ShareHolder sh:p.getShareHolderPool().getPool().values()) { - if(!(sh instanceof Project)) - continue; - - if(sh.getValue()<=.01) - continue; - - done=false; - ((Project) sh).payout(); - } - } - for(ShareHolder sh: p.getShareHolderPool().getPool().values()) if(sh.getValue()>.01) System.out.println(sh.getName()+": "+sh.getValue()); diff -ruN rcsC0.new/src/app/rcs/ui/cmdline/aMock rcsC0/src/app/rcs/ui/cmdline/aMock --- rcsC0.new/src/app/rcs/ui/cmdline/aMock 2007-10-27 22:52:58.000000000 -0400 +++ rcsC0/src/app/rcs/ui/cmdline/aMock 1969-12-31 19:00:00.000000000 -0500 @@ -1 +0,0 @@ -aMock|aryeh:0:0.0|aryeh:0:0.5|aryeh:0:0.5 \ No newline at end of file