Matthieu Moy wrote:
>>> 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.
The big reason you need tags in CVS is to tie a whole bunch of files
together at a certain revision level. Subversion already has a concept
of a project that groups the files and it has unique revision numbers to
identify a revision of the whole thing if you don't want the most recent.
> I'm repeating myself, but here's the old CVS flow:
> 1) When the students have something reasonable, they put the tag once.
What happens at this point? Could they just send an email or add a file
to the project to indicate that they have something reasonable?
> 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.
Keep in mind that CVS works with files, not projects so those "move a
tag" operations weren't really atomic either.
> I really don't see how the students could do 3) above without a merge.
You only need to merge if you have something in two locations. The
simplest approach is to copy a branch for each person (which can be done
ahead of time if that isn't part of the work) which they check out and
commit changes. The branch revision at the deadline is the final
product. The only missing piece is how you indicate the 'reasonable'
point. Copying to a tag which can be deleted and replaced is one way
but if you don't like that perhaps you can come up with something
completely different - like passing a revision number around. Or there
is the multi-command tool if you want a tag delete/copy to be a single
To unsubscribe, e-mail: email@example.com
For additional commands, e-mail: firstname.lastname@example.org
Received on Tue Oct 30 22:12:47 2007