As a request from someone who has messed this up before, when you've made the change, can you post 'svn switch' lines? Personally I've moved on to git, which makes this process easier (and the results of messing up more spectacular :-) Simon <blockquote type="cite">On Jul 29, 2010 10:31 AM, "Bernd Kiefer" <<a href="mailto:kiefer@dfki.de">kiefer@dfki.de</a>> wrote: Hi all, by the beginning of next week, i will carry out the first step on the PetRoadMap, namely the merging of the cm and the main branch. The last merge has been performed by Peter, and i've looked at the remaining diffs. The next steps are the following: - creating two new branches: legacy-main and legacy-cm, which reflect the current state of the main and cm branch, respectively - superseding main with cm This will be done Monday or Tuesday next week, unless there are unforeseeable obstacles, or serious objections, if they reach me in time. Best, Bernd -- ---------------------------------------------------------------------- Bernd Kiefer DFKI GmbH, Stuhlsatzenhausweg, D-66123 Saarbruecken <a href="mailto:kiefer@dfki.de" target="_blank">kiefer@dfki.de</a> +49-681/85775-5301 (phone) +49-681/85775-5338 (fax) ---------------------------------------------------------------------- Deutsches Forschungszentrum fuer Kuenstliche Intelligenz GmbH Trippstadter Strasse 122, D-67663 Kaiserslautern, Germany Geschaeftsfuehrung: Prof. Dr. Dr. h.c. mult. Wolfgang Wahlster (Vor- sitzender), Dr. Walter Olthoff Vorsitzender des Aufsichtsrats: Prof. Dr. h.c. Hans A. Aukes Amtsgericht Kaiserslautern, HRB 2313 </blockquote>