Paul Vinkenoog wrote: >> We can start with a simple solution. Just create a single "release" >> > branch which gets modified the every time we publish something on the >> > site. The HEAD branch must keep at least the same version as the >> > "release" one. It may also have newer (immature) versions committed, but >> > it is up to the author. > Hmmm... so any "dirty" versions are committed to HEAD (or stay on Helen's > computer), and as soon as something can be published, it's committed to the > release branch. Simple and effective! Why, you don't even need tags with this > approach - although you can use them if you want to. > > Now why didn't*I* think of this?:-) > > I'm all for it. It only requires some extra attention to our local copies; we > have to know whether we're on a branch or not while working on the sources. > But even that is simple: all the editing work is done in HEAD.
This might ACTUALLY be a situation where hg ( or git is you must ) can be made to work ... A managed version of the release copy is maintained and only 'approved' material is allowed into it. Anybody else can manage their own work locally and maintain their own commits, information on which can be merged with the 'master' as required. DVCS has created as many problems as it supposedly solved, but part of the problem IS simply managing a clean master copy and controlling what goes into it. This may become academic since while cvs to hg conversion is currently simple, work is ongoing on the mirror link. svn<>hg simply works. Having said that, the nice side by side view of local and cvs based files to pick and choose from in Eclipse is still work in progress :( Why is everything one step forward and two back? -- Lester Caine - G8HFL ----------------------------- Contact - http://lsces.co.uk/wiki/?page=contact L.S.Caine Electronic Services - http://lsces.co.uk EnquirySolve - http://enquirysolve.com/ Model Engineers Digital Workshop - http://medw.co.uk// Firebird - http://www.firebirdsql.org/index.php ------------------------------------------------------------------------------ All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2d-c2 _______________________________________________ Firebird-docs mailing list Firebird-docs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/firebird-docs
