#174: Merge back branch cleanup-2008 into the trunk ------------------------+--------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: task | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: repository | ------------------------+--------------------------------------------------- As of r2335 (2009-09-17), source:trunk/ has been entirely merged into source:branches/cleanup-2008/, and everybody is using the cleanup-2008 branch. So, there is not point in maintaining two branches. Moreover, as more and more Olena Team members are using Git, we should avoid using Subversion branches (e.g., on the SVN ''server''), and use Git's instead. The plan is as follow : 1. Warn contributors about the forthcoming merge, to * '''prevent them from committing to Olena''' until further notice; * have them switch (all of their) Subbversion working copies (or Git repositories) to source:trunk/. 1. Overwrite the content of source:trunk/ with the latest revision of source:branch/cleanup-2008/ (probably using `svn rm` then `svn cp`). Don't try to reintegrate patches one by one, since there have been many merges from trunk to cleanup-2008, and we'll probably end up with a very complicated set of conflicting merges. Remember we're not ''really'' merging back cleanup-2008 to trunk, as the merge(s) ''already occurred'', and cleanup-2008 already contains what trunk has (see source:branches/README.branches). We're merely replacing the current trunk with the content of cleanup-2008. 1. Notify contributors they can work from the trunk again. 1. Update source:branches/README.branches, but don't close (remove) the branch source:branch/cleanup-2008/, as it might disturb Git repositories aware of this branch. Simply set its status as 'CLOSED'. I (Roland) should be the one performing this task. -- Ticket URL: <https://trac.lrde.org/olena/ticket/174> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.