[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Using tags to manage releases?

From: Ole Pinto <olepinto_at_gmail.com>
Date: Wed, 1 Jun 2011 11:43:16 +0200

2011/6/1 Thorsten Schning <tschoening_at_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...
Received on 2011-06-01 11:44:10 CEST

This is an archived mail posted to the Subversion Users mailing list.