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 2710 d 10 h luke /branches/R-conflicts/ Drop error.on.conflicts option and just use conflicts.policy.  
75738 2794 d 16 h luke /branches/R-conflicts/ Renamed conflicts.control option to conflicts.policy.  
75636 2806 d 4 h luke /branches/R-conflicts/ Rename 'only' to 'include.only' and 'omit' to 'exclude'.  
75632 2806 d 7 h luke /branches/R-conflicts/ Cleanups.  
75630 2806 d 8 h luke /branches/R-conflicts/ Added depends.ok control.  
75608 2812 d 2 h luke /branches/R-conflicts/ Add the conflicts.control option for specifying some aspects of the
conflict resolution process.		  
75600 2813 d 4 h luke /branches/R-conflicts/ Separate warning control and error control.  
75523 2827 d 1 h luke /branches/R-conflicts/ Alternatives to only, omit.  
75522 2827 d 1 h luke /branches/R-conflicts/ Some adjustments and update html.  
75463 2839 d 2 h luke /branches/R-conflicts/ Factor out questions.  
75461 2839 d 3 h luke /branches/R-conflicts/ Remove TODO item on types error.  
75460 2839 d 3 h luke /branches/R-conflicts/ Signale a typed error for conflicts.  
75456 2839 d 4 h luke /branches/R-conflicts/ Fixed BiocGenerics example.  
75455 2839 d 6 h luke /branches/R-conflicts/ Cleanups.  
75454 2839 d 6 h luke /branches/R-conflicts/ Initial commit of conflict resolution framework.