On 30 Oct 2007, at 20:37, Matthieu Moy wrote:
> Les Mikesell <lesmikesell@gmail.com> writes:
>
>>> There's no point having branches if you
>>> don't have merge, and there's very little point having it if you
>>> don't
>>> have switch.
>>
>> You don't need a merge unless you want to combine the work back onto
>> the trunk. If this work is graded and discarded, you just need the
>> equivalent of a branch copy per student, which you don't have to call
>> a branch unless you want to.
>
> Then I missed something.
>
> I'm repeating myself, but here's the old CVS flow:
>
> 1) When the students have something reasonable, they put the tag once.
>
> 2) Then, they can continue working, and commiting.
>
> 3) When they tested a commit enough, they can move the tag. They can
> move the tag as many times as they want, the last tag is the one
> taken into account.
>
> Now, with SVN, I have a similar flow, but "moving a tag" is done in
> two steps, and I'm looking for something simpler.
>
> I really don't see how the students could do 3) above without a merge.
Here's a way to simplify it. When the students make a new version of
the project that they deem suitable for viewing by the assessors,
they merely copy it to the tags directory with a unique name - e.g. a
monotonically increasing serial number or an alliterative animal
alias (e.g. horny hedgehog or fiery frog). For convenience, I'll
refer to each of these copies as a "release". Then you assess the
newest release in the tags directory that appeared prior to the
deadline, or better still, you require them to send you a "release
note" detailing what it is called and what changes made since the
previous release make it a better solution e.g. bug fixes and new
features.
From your description, this looks like a software development
assessment. If this is the case, then you really do want to
implement what I suggest since that is generally what happens in the
real world. Also, one of your previous comments about shielding the
students from the concept of a branch would concern me - version
control is an integral part of software development and the students
will have to know about it one day.
>
>>>>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Oct 31 13:56:15 2007