The R Project SVN R

Rev

Show changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff
76154 2709 d 19 h luke /branches/R-conflicts/ Drop error.on.conflicts option and just use conflicts.policy.  
75738 2794 d 1 h luke /branches/R-conflicts/ Renamed conflicts.control option to conflicts.policy.  
75636 2805 d 13 h luke /branches/R-conflicts/ Rename 'only' to 'include.only' and 'omit' to 'exclude'.  
75634 2805 d 15 h luke /branches/R-conflicts/ Allow short-hand control specification.  
75632 2805 d 16 h luke /branches/R-conflicts/ Cleanups.  
75630 2805 d 17 h luke /branches/R-conflicts/ Added depends.ok control.  
75608 2811 d 12 h luke /branches/R-conflicts/ Add the conflicts.control option for specifying some aspects of the
conflict resolution process.		  
75600 2812 d 13 h luke /branches/R-conflicts/ Separate warning control and error control.  
75523 2826 d 10 h luke /branches/R-conflicts/ Alternatives to only, omit.  
75522 2826 d 10 h luke /branches/R-conflicts/ Some adjustments and update html.  
75521 2826 d 14 h luke /branches/R-conflicts/ Added 'only' argument to 'require()'.  
75520 2826 d 14 h luke /branches/R-conflicts/ Renamed maskOK to mask.ok as suggested by Hadley Wickham.  
75463 2838 d 12 h luke /branches/R-conflicts/ Factor out questions.  
75461 2838 d 12 h luke /branches/R-conflicts/ Remove TODO item on types error.  
75460 2838 d 13 h luke /branches/R-conflicts/ Signale a typed error for conflicts.  
75456 2838 d 14 h luke /branches/R-conflicts/ Fixed BiocGenerics example.  
75455 2838 d 15 h luke /branches/R-conflicts/ Cleanups.  
75454 2838 d 16 h luke /branches/R-conflicts/ Initial commit of conflict resolution framework.