On 10/23/2009 04:42 PM, Andreas Jellinghaus wrote: <snip> > So what will be the best way to start 0.12 development > in /trunk/? > > a) merge all changes from 0.12 branch into trunk? > (how to do that? as one big change, or as a series > of commits?) > b) svn rm /trunk/; svn mv /branches/martin/0.12 /trunk ?
Option a) is probably better, because then the development history in trunk is preserved. Martin used to do his development in git. If that's still the case, it might be possible to rebase his work on top of the new changes in trunk and then merge it to svn as a series of commits. -- Kalev Lember _______________________________________________ opensc-devel mailing list [email protected] http://www.opensc-project.org/mailman/listinfo/opensc-devel
