Re: svn access for summer of code students
Miklos Vajna <vmiklos <at> frugalware.org>
2009-05-04 21:39:02 GMT
On Mon, May 04, 2009 at 09:30:58PM +0100, William S Fulton <wsf <at> fultondesigns.co.uk> wrote:
> I've set up a developer accounts for all of the summer of code students.
> You should all be able to check into svn now. Please create a branch for
> doing your development work (except Kosei who is using the Xapian repo).
> I suggest calling your branches gsoc2009-xxx, where xxx is your SF
> account name.
>
> For now, please create your branch and make a simple commit, for
> example, add your name/email into the README file so that we know you
> are up and running ready to start commiting when coding starts on 23
> May.
I've did an
$ svn copy https://swig.svn.sourceforge.net/svnroot/swig/trunk \
https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2009-vmiklos \
-m "Making Miklos' GSoC Branch"
> Please also subscribe to the swig-cvs mailing list, so you can
> track your own commits as well as others. Maybe it is a bit confusing,
> as the mailing list name contains cvs, but the swig-cvs mailing list is
> used for svn commits!
Ugh, I did it in the wrong order, I subscribed after committing, so the
mail generated from my commit is now pending, sorry for that.
>
> Make sure you use a subversion 1.5 or higher client for when you do
> merging. This is quite important, else the merge info doesn't work
> properly as subversion underwent some big merging improvements in 1.5.
> Although, I can't see how to verify this, the SF svn server now seems to
> use version 1.5
> (http://apps.sourceforge.net/trac/sourceforge/wiki/Subversion), so we
> can use the improved svn merging. Previously we used svnmerge.py for
> merging, but this should no longer be necessary.
Ok, using 1.5.4.
> We're hoping your work will be in a good enough state at the end of
> the coding period to then merge back into trunk for release to the
> general public. I therefor suggest you all merge from svn trunk to
> your branch regularly because if you don't merge regularly, merging
> can start to get rather complicated and messy.
What is the recommended interval? I would imagine that we work on our
project, and once it is in a reasonable shape (so we both have the
necessary code and unit tests done), we can also merge trunk to your
branch and resolve conflicts if there are any. Is this a bad idea and
should we merge for example each day? In that case we'll see smaller
conflicts but we won't have a clean history because of big number of
unnecessary merges.
Thanks.
------------------------------------------------------------------------------
Register Now & Save for Velocity, the Web Performance & Operations
Conference from O'Reilly Media. Velocity features a full day of
expert-led, hands-on workshops and two days of sessions from industry
leaders in dedicated Performance & Operations tracks. Use code vel09scf
and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
------------------------------------------------------------------------------
Register Now & Save for Velocity, the Web Performance & Operations
Conference from O'Reilly Media. Velocity features a full day of
expert-led, hands-on workshops and two days of sessions from industry
leaders in dedicated Performance & Operations tracks. Use code vel09scf
and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf