perl-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Torsten Foertsch <torsten.foert...@gmx.net>
Subject Question about branching
Date Sat, 28 Jun 2008 10:08:10 GMT
Hi,

this is an excerpt of our BRANCHING document:

> #######################################
> ### make a new branch               ###
> #######################################
>
> we will create a branch mybranch
>
> branch:
>
>   svn copy https://svn.apache.org/repos/asf/perl/modperl/trunk \
>     https://svn.apache.org/repos/asf/perl/modperl/branches/mybranch \
>     -m "creating mybranch"
>
> check out:
>
>   svn co https://svn.apache.org/repos/asf/perl/modperl/branches/mybranch
>
> change externals to point to the new A-T branch (if one was done)
>
>   svn propedit svn:externals .

The threading branch doesn't have a new A-T or docs. Hence, A-T and docs point 
to the current trunk. I don't want to commit something by chance to these 
trees. Can I have SVN automatically forbid such changes?

> initialize svnmerge tracking in the branch (if you plan to pull trunk/
> changes into the branch)

Is this thought to be one big commit? Or should it rather be a set of smaller 
changes?

> mybranch/ $> svnmerge init

When am I supposed to do this before I begin to integrate trunk changes or 
after all changes are committed to my branch?

> property 'svnmerge-integrated' set on '.'
> mybranch/ $> svn ci -F svnmerge-commit-message.txt

Is this done as a separate commit or is it the one big commit or the last one?

Sorry for being so stupid,
Torsten

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org


Mime
View raw message