Tim Cook wrote:
> 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?
Use svn switch to point their working copies at the new URLs you want them to
commit to.
Blair
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-25 18:15:37 CEST