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 _______________________________________________ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[EMAIL PROTECTED]"