• last updated 16 hours ago
Constraints: committers
Constraints: files
Constraints: dates
Picked up some changes missed by the join of oacs-5-2 and oacs-5-3. It turns

out the cvs won't join files if it has already done some merging previously.

In this case I'd previously merged oacs-5-2 to HEAD, then branched oacs-5-3, then

reopened the 5.2 branch for minor bug fixing for .LRN 2.2.1. This confused

CVS or ... at least made it stubborn.

  1. … 5 more files in changeset.
Fixed bug #2999: Merge users fails.

  1. … 1 more file in changeset.
Merged acs-core oacs-5-2 (currently 5.2.3) -> HEAD.


1. Bump acs-core package version numbers to 5.3.0d1

2. Would be nice to do a test install, wouldn't it?

  1. … 721 more files in changeset.
Improving the resultant messages output of each callback of the merge process

  1. … 2 more files in changeset.
Adding a proc call that will merge the users objects, permissions and protraits

Adding an 'if' clause in adp merge final page if the user doesn't want to merge.

  1. … 2 more files in changeset.
Fixing bugs in user merge support. Improving the process, making it more generic and now it works for acs-core. Adding the upgrade scripts for oracle and pg.

  1. … 13 more files in changeset.
Adding GUI to merge user accounts. I modified the 'one acs admin user' page and 'search' page to support this.

  1. … 16 more files in changeset.
file merge-final.tcl was initially added on branch oacs-5-2.