Re: Proposed change to Development

On Fri, Oct 13, 2006 at 09:59:23AM +0200, Benjamin Schieder wrote:
> Hi list.
> 
> th and I just discussed a possible change to the current way of development
> and we like to hear your opinion on it:
> 
[...]
> 
> We can create branches in the rock-linux subversion repository.

[...]

and here we go: i just created
https://www.rocklinux.net/svn/rock-linux/wip
please send me your output of `htpasswd -n -m $USER` and i'll add you to
subversion authorization file / passwd.

all such developer branches shall be placed in the /wip directory. these
branches have been decided to:
	* ease collaborative development by providing more
	  relaxed write permissions
	* be created upon request
	* not be a source for svn-merges because this would
	  give wrong revision properties and is not really 
	  necessary:
	* be used with some 'to-be-created' client-side scripts
	  to upload diffs to smng (with similar outcome to a merge)

thats it for the beginning.

th
--
> Developers
> working on the respective branch will get write access there. For example
> 
> 	rock-linux/branches/etcnet
> 
> for the integration of /etc/net into ROCK. Developers can then directly commit
> their changes there. When they are done, they request a 'svn merge' of this
> branch into trunk.
> Submaster is to be modified to allow for this kind of requests.
> The smng server can even display the patch by doing a 'svn diff'.
> 
> Here is an example of how this might work. This is based on the
> "Feature Branch" section of
> 	http://svnbook.red-bean.com/nightly/en/svn.branchmerge.commonuses.html
> 
> At the start of a project - say /etc/net integration - the head developer of
> that project asks for a branch to be created and write access given to the
> developers that work on that project.
> A branch is then created by means of 'svn cp trunk branches/etcnet'.
> Work continues both in trunk and the etcnet branch. The branch should get
> the changes in trunk regularly. The mechanism to do that is 'svn merge'.
> This is the job of the branch developers.
> When work on the branch is done, a merge of the branch into trunk is
> requested. This will then be subject to the same kind of review as patches
> are with the current system.
> 
> A merge request can look like this:
> 
> /etc/net integration team:
> 	merge work on /etc/net into trunk.
> 	svn merge -r 8912:9123 svn://www.rocklinux.net/rock-linux/branches/etcnet
> 
> 
> 
> The advantage of this is that developers can work together on certain
> projects without having to wait for a week for every change to be applied.
> Another advantage is that meta-information from 'svn mv' 'svn del' and
> 'svn add' is preserved. With 'diff' based operation, that information may be
> lost unless people are really careful.
> 
> 
> Comments, please!
> 
> 
> Greetings,
> 	blindy
> -- 
>  _  _     _   _            _   
> | \| |___| |_| |_  __ _ __| |__
> | .` / -_)  _| ' \/ _` / _| / /
> |_|\_\___|\__|_||_\__,_\__|_\_\
> | |  (_)_ _ _  ___ __
> | |__| | ' \ || \ \ /
> |____|_|_||_\_,_/_\_\
> Play Nethack anywhere with an x86 computer:
> 	http://www.crash-override.net/nethacklinux.html



> _______________________________________________
> rock-devel mailing list
> [email protected]
> http://www.rocklinux.net/mailman/listinfo/rock-devel


-- 
Tobias Hintze