R – /branches/R-conflicts/CONFLICTS.md

Rev 76154 – Drop error.on.conflicts option and just use conflicts.policy.

luke — Sun, 24 Feb 2019 14:45:54 +0000

luke – 3 file(s) modified
Drop error.on.conflicts option and just use conflicts.policy.

~ /branches/R-conflicts/CONFLICTS.html
~ /branches/R-conflicts/CONFLICTS.md
~ /branches/R-conflicts/src/library/base/R/library.R

Rev 75738 – Renamed conflicts.control option to conflicts.policy.

luke — Sun, 02 Dec 2018 08:38:29 +0000

luke – 4 file(s) modified
Renamed conflicts.control option to conflicts.policy.

~ /branches/R-conflicts/CONFLICTS.html
~ /branches/R-conflicts/CONFLICTS.md
~ /branches/R-conflicts/src/library/base/man/library.Rd
~ /branches/R-conflicts/src/library/base/R/library.R

Rev 75636 – Rename 'only' to 'include.only' and 'omit' to 'exclude'.

luke — Tue, 20 Nov 2018 20:47:46 +0000

luke – 6 file(s) modified
Rename 'only' to 'include.only' and 'omit' to 'exclude'.

~ /branches/R-conflicts/CONFLICTS.html
~ /branches/R-conflicts/CONFLICTS.md
~ /branches/R-conflicts/src/library/base/man/library.Rd
~ /branches/R-conflicts/src/library/base/man/ns-load.Rd
~ /branches/R-conflicts/src/library/base/R/library.R
~ /branches/R-conflicts/src/library/base/R/namespace.R

Rev 75634 – Allow short-hand control specification.

luke — Tue, 20 Nov 2018 18:20:33 +0000

luke – 2 file(s) modified
Allow short-hand control specification.

~ /branches/R-conflicts/CONFLICTS.md
~ /branches/R-conflicts/src/library/base/R/library.R

Rev 75632 – Cleanups.

luke — Tue, 20 Nov 2018 17:22:04 +0000

luke – 2 file(s) modified
Cleanups.

~ /branches/R-conflicts/CONFLICTS.html
~ /branches/R-conflicts/CONFLICTS.md

Rev 75630 – Added depends.ok control.

luke — Tue, 20 Nov 2018 16:33:50 +0000

luke – 3 file(s) modified
Added depends.ok control.

~ /branches/R-conflicts/CONFLICTS.html
~ /branches/R-conflicts/CONFLICTS.md
~ /branches/R-conflicts/src/library/base/R/library.R

Rev 75608 – Add the conflicts.control option for specifying some aspects of the ...

luke — Wed, 14 Nov 2018 22:07:19 +0000

luke – 4 file(s) modified
Add the conflicts.control option for specifying some aspects of the
conflict resolution process.

~ /branches/R-conflicts/CONFLICTS.html
~ /branches/R-conflicts/CONFLICTS.md
~ /branches/R-conflicts/src/library/base/man/library.Rd
~ /branches/R-conflicts/src/library/base/R/library.R

Rev 75600 – Separate warning control and error control.

luke — Tue, 13 Nov 2018 20:49:49 +0000

luke – 4 file(s) modified
Separate warning control and error control.

~ /branches/R-conflicts/CONFLICTS.html
~ /branches/R-conflicts/CONFLICTS.md
~ /branches/R-conflicts/src/library/base/man/library.Rd
~ /branches/R-conflicts/src/library/base/R/library.R

Rev 75523 – Alternatives to only, omit.

luke — Tue, 30 Oct 2018 23:28:26 +0000

luke – 2 file(s) modified
Alternatives to only, omit.

~ /branches/R-conflicts/CONFLICTS.html
~ /branches/R-conflicts/CONFLICTS.md

Rev 75522 – Some adjustments and update html.

luke — Tue, 30 Oct 2018 23:23:55 +0000

luke – 2 file(s) modified
Some adjustments and update html.

~ /branches/R-conflicts/CONFLICTS.html
~ /branches/R-conflicts/CONFLICTS.md

Rev 75521 – Added 'only' argument to 'require()'.

luke — Tue, 30 Oct 2018 20:06:45 +0000

luke – 3 file(s) modified
Added 'only' argument to 'require()'.

~ /branches/R-conflicts/CONFLICTS.md
~ /branches/R-conflicts/src/library/base/man/library.Rd
~ /branches/R-conflicts/src/library/base/R/library.R

Rev 75520 – Renamed maskOK to mask.ok as suggested by Hadley Wickham.

luke — Tue, 30 Oct 2018 19:42:58 +0000

luke – 3 file(s) modified
Renamed maskOK to mask.ok as suggested by Hadley Wickham.

~ /branches/R-conflicts/CONFLICTS.md
~ /branches/R-conflicts/src/library/base/man/library.Rd
~ /branches/R-conflicts/src/library/base/R/library.R

Rev 75463 – Factor out questions.

luke — Thu, 18 Oct 2018 22:00:12 +0000

luke – 2 file(s) modified
Factor out questions.

~ /branches/R-conflicts/CONFLICTS.html
~ /branches/R-conflicts/CONFLICTS.md

Rev 75461 – Remove TODO item on types error.

luke — Thu, 18 Oct 2018 21:13:03 +0000

luke – 2 file(s) modified
Remove TODO item on types error.

~ /branches/R-conflicts/CONFLICTS.html
~ /branches/R-conflicts/CONFLICTS.md

Rev 75460 – Signale a typed error for conflicts.

luke — Thu, 18 Oct 2018 21:09:32 +0000

luke – 3 file(s) modified
Signale a typed error for conflicts.

~ /branches/R-conflicts/CONFLICTS.html
~ /branches/R-conflicts/CONFLICTS.md
~ /branches/R-conflicts/src/library/base/R/library.R

Rev 75456 – Fixed BiocGenerics example.

luke — Thu, 18 Oct 2018 19:56:59 +0000

luke – 2 file(s) modified
Fixed BiocGenerics example.

~ /branches/R-conflicts/CONFLICTS.html
~ /branches/R-conflicts/CONFLICTS.md

Rev 75455 – Cleanups.

luke — Thu, 18 Oct 2018 18:22:38 +0000

luke – 2 file(s) modified
Cleanups.

~ /branches/R-conflicts/CONFLICTS.html
~ /branches/R-conflicts/CONFLICTS.md

Rev 75454 – Initial commit of conflict resolution framework.

luke — Thu, 18 Oct 2018 18:05:25 +0000

luke – 7 file(s) modified
Initial commit of conflict resolution framework.

+ /branches/R-conflicts/CONFLICTS.html
+ /branches/R-conflicts/CONFLICTS.md
~ /branches/R-conflicts/src/library/base/man/library.Rd
~ /branches/R-conflicts/src/library/base/man/ns-load.Rd
~ /branches/R-conflicts/src/library/base/man/options.Rd
~ /branches/R-conflicts/src/library/base/R/library.R
~ /branches/R-conflicts/src/library/base/R/namespace.R