2011/6/1 Thorsten Schöning <tschoen...@am-soft.de> > ... > Therefore I would prefer proper proper merging by the developer, > because you get a useful diff and log message in the changed file for > QA. >
At least, the merging could automatically be done on the server: when getting the commit, take note of the revision being generated, and maybe launch a task to do: svn co ..../release/<rel_num> (unless it already exists, in which case, a svn update would suffice) svn merge --non-interactive .../trunk -c<revision previously generated> Check for conflicts (maybe "svn st | grep "^ *C"); if there are, mail the developer asking to merge manually. If not, svn ci -m "Merged from trunk:<revision previously generated>:<log from the trunk>" Be careful to run those tasks in order...
