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

Best Way to Correct my Mistake?

From: Tim Cook <timothywayne.cook_at_gmail.com>
Date: Fri, 25 Jul 2008 06:32:31 -0300

I didn't plan ahead well enough and now I am faced with a merge
situation that I'm not sure how to handle best.

I have a project in svn (http://www.openehr.org/svn/ref_impl_python/)
that only I have been committing to. I am now running a workshop and I
had seven people checkout from the TRUNK/oship directory onto a local
machine. Now they are all making changes but I do not want them to
commit to the TRUNK. I created a BRANCH for the workshop that is now at
the same revision as the TRUNK (but is newer than the version they all
checked out). Each of the seven people now has commit access to the
BRANCH/LNCCWorkshop directory.

My thought was that I would have to take a copy of each persons code;
export it to remove the revision info; create a BRANCH for each persons
code; merge each one with BRANCH/LNCCWorkshop then have them do a new
checkout of the BRANCH/LNCCWorkshop so they are all starting with the
same code again.

Is there an easier way to do this?


Join the OSHIP project.  It is the standards based, open source
healthcare application platform in Python.
Home page: https://launchpad.net/oship/ 
Wiki: http://www.openehr.org/wiki/display/dev/Python+developer%27s+page 

Received on 2008-07-26 06:30:43 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.