Jon Maber wrote:
> If we create a branch in the (svn) source forge repository, how do we
> import the oxford work into that branch while _preserving all the oxford
> check ins and check in notes_. I'm thinking of putting the branch off
> of the trunk at the date when the oxford rep. started to drift off.
> Obviously it would be easy to put the Oxford head on the branch but then
> everyone would have to go to your svn to trace back edits etc.
Couple of thoughts:
- I'm pretty sure importing the Oxford SVN into a SF SVN branch would include all the history from
our SVN.
- To make things more complex, we didn't simply stop committing to Bod at a single point in time. We
always had stuff that was Oxford specific, and then selectively pulled or pushed bits to and from Bod.
- Our release version numbers were based on Bod (starting at 2.6 I think) but we had more releases
so got out of synch.
Colin
--
____________________________________
Colin Tatham
VLE Team
Oxford University Computing Services
http://www.oucs.ox.ac.uk/ltg/vle/
http://bodington.org
|