Merging in Subversion is a major PITA, but fortunately this is about to change with version 1.5, see this blog entry for details:
http://blog.red-bean.com/sussman/?p=92 Hopefully this will make it easier for us to use more pervasive use of branches. This means, for example, that if making a big change, this can be done in a branch so that trunk remains stable. If we wanted to be really ambitious, we could build snapshots of each branch too, but that would be a reasonable amount of work. Ian. -- Email: ian at uprizer.com Cell: +1 512 422 3588 Skype: sanity
