You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by "Jan.Kester" <Ja...@pdv.de> on 2004/09/13 08:01:24 UTC
Find out which branches exist
Hello
I am learning subversion now, and try to apply it to our working methods.
What I don't see is how I can keep track of branch generation points.
Imagine that I am main responsible for the trunk, and at certain moment need
to make a new delivery. I would like to make sure that all other team
members have merged their contributions into the main trunk. How can I find
out which team members have created branches of my trunk?
Regards, Jan.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Find out which branches exist
Posted by William Nagel <bi...@stagelogic.com>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
>> It's less overhead, but it's also a good way to end up with a broken
>> trunk.
>
>
> Er, only if people check broken code into the trunk. I agree that big,
> experimental changes might require branching, but Subversion, for
> example, seems to work fine with everyone checking into the trunk. A
> decent test suite and continuous integration should let you reliably
> check into the trunk.
It really depends a lot on your project's process.
Only committing to the trunk will only work if either:
a) all of the changes are small and incremental, which is a nice goal,
but isn't always practical for many real-world projects.
b) commits consist of multiple distinct changes per commit, which loses
you many of the advantages of using Subversion.
From my own experiences with using Subversion, I would strongly
recommend using branches liberally for distinct non-trivial development
tasks.
- -Bill
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)
iD8DBQFBRx55Swe0AHUdEwQRAhyWAJ0fbMmFsDt13z0/tPAmwTDML9GRBACg1vJd
lzp3DwhRDPH8Q78Aa+JyVA0=
=kDpw
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Find out which branches exist
Posted by Mike Mason <mi...@mac.com>.
William Nagel wrote:
>> Your question seems to imply that developers are creating branches
>> often -- is this because they're creating "task branches" and merging
>> back to the trunk frequently? You might find a model where everyone
>> checks into the trunk is less overhead.
>
>
> It's less overhead, but it's also a good way to end up with a broken
> trunk.
Er, only if people check broken code into the trunk. I agree that big,
experimental changes might require branching, but Subversion, for
example, seems to work fine with everyone checking into the trunk. A
decent test suite and continuous integration should let you reliably
check into the trunk.
Cheers,
Mike.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Find out which branches exist
Posted by William Nagel <bi...@stagelogic.com>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
> Your question seems to imply that developers are creating branches
> often -- is this because they're creating "task branches" and merging
> back to the trunk frequently? You might find a model where everyone
> checks into the trunk is less overhead.
It's less overhead, but it's also a good way to end up with a broken
trunk.
A better way might be to manage the merges by insisting that merges
back into the trunk contain a suitable log message, which will allow
someone to quickly look through the logs and see how recently each
person has merged back into the trunk. If the log files are properly
structured, you could even write a script to automatically generate a
report (and you can use a pre-commit hook script to ensure that all
logs are properly structured). Really, it shouldn't even be all that
difficult to write a script that would parse through the log files and
compare them with the commit times for modifications to each branch to
prepare a report that would show you which branches had modifications
that weren't committed to the trunk.
- -Bill
>
> Cheers,
> Mike.
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)
iD8DBQFBRbaaSwe0AHUdEwQRAnnPAKDVvWhiRqYXAAFdcpo44wYCRc2zpQCeNI8K
LQ/l/iZgwT6zOu0uv4mOc84=
=Qq/5
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Find out which branches exist
Posted by Mike Mason <mg...@thoughtworks.net>.
Jan.Kester wrote:
>Hello
>
>I am learning subversion now, and try to apply it to our working methods.
>What I don't see is how I can keep track of branch generation points.
>Imagine that I am main responsible for the trunk, and at certain moment need
>to make a new delivery. I would like to make sure that all other team
>members have merged their contributions into the main trunk. How can I find
>out which team members have created branches of my trunk?
>
>
If you're using a common style for naming your branches, they'll all be
in a directory called /branches so you can just look there to see what
branches you have (if you're not using a common naming scheme like that
then you should probably think about fixing that problem first!). Once
you know what branches you have, it should be easy to find the branch
owners and ask them if their changes have been merged.
This book reference might help:
http://svnbook.red-bean.com/svnbook/ch05s04.html#svn-ch-5-sect-6.1
Your question seems to imply that developers are creating branches often
-- is this because they're creating "task branches" and merging back to
the trunk frequently? You might find a model where everyone checks into
the trunk is less overhead.
Cheers,
Mike.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org