Re: [CEDET-devel] Migration to bazaar

[Lluís <xs...@gm...>]

Eric M Ludlam writes:
>> Once we all agree on the state of the conversion, the CVS repository should be
>> left in read-only mode, and development shifted into the bzr repository.

> Perhaps I should tag and release a CEDET 1.0 in CVS this weekend, as it 
> seems stable enough and has had plenty of preview releases.  That would 
> free the bzr repository to move into the new file naming conventions 
> needed by Emacs.

> I don't have any pending changes left.

All right then. If nobody has fixes to commit, let's just tag current state as
the 1.0 release.

Feel free to commit changes to the CVS. If it gets changes I'll just migrate
repositories again, which is pretty painlessly automated with the scripts I sent
to the list.

Once having this, the development process and branch organization should be
documented somewhere (aka web page or a wiki). We could just refer the developer
to http://www.emacswiki.org/emacs/BzrQuickStartForEmacsDevs and highlight just
the differences on URLs.

Thinking of the web, the current tree is organized as:
    cedet-build.el
    cedet-ediff.el
    cedet-update-changelog.el
    cedet-update-version.el
    cogre/
    common/
    contrib/
    CVS/
    ede/
    eieio/
    Emacs2CEDET
    gettodos.sh*
    INSTALL
    Makefile
    Makefile.wwwinfo
    PRERELEASE_CHECKLIST
    quickpeek/
    semantic/
    speedbar/
    srecode/
    testdist.sh*
    testprojects/
    tests/
    USING_CEDET_FROM_CVS
    www/

And I think the part concerning the web page (is it only www/?) should be
seggregated onto a different repository/branch, which brings me again to the
question of how the repository should be organized.

---- on bazaar ----
Disclaimer: You'll probably have a better explanation somewhere else. Here's a
            link for the CVS savvy:
                http://wiki.bazaar.canonical.com/BzrForCVSUsers


Taking a step back, I'll try to summarize my grasps on how bazaar works. The 3
basic concepts about organization (let alone commits) are:
    - repository
    - branch
    - tag

A repository is just a directory used as storage space for changesets (commits),
which can be created with 'bzr init-repo'. In fact, we will create such
repositories on the central server with 'bzr init-repo --no-trees', but an
explanation of why is out of the scope of this mail.

A branch is what developers will work with, much in the same fashion as
subversion (one directory for each branch). Branches also have some information
about the parent branch, such that one can understand how branches are related
to each other. Such branches are created with 'bzr init'. If multiple branches
are created as subdirectories of a repository (even if they are deeply nested),
they will all share the same storage. This makes sense for branches that are
related, as much of the changeset history will be exactly the same among such
branches.

A tag is just a user-specified name for a changeset in a branch, and tag
infomation can be passed onto other branches when these are merged.
---- on bazaar ----


So, this is all to say that the bzr in SF should be organized in, at least, two
repositories (r):
    www/  [r]
    code/ [r] (or any other name)

And branches (b) could then be something like:
    www/        [r+b] (there will probably be just a single branch for the web)
    code/       [r]
    code/trunk/ [b]

At first only the 'code/trunk/' branch will be available, but it is recommended
to start a new branch for each non-trivial set of changes. Those features
requiring long development/integration time that must be available to multiple
developers should then be published on the SF repository, such that they can all
be developed separately.

Again, have a look at: http://www.emacswiki.org/emacs/BzrQuickStartForEmacsDevs


Summarizing:
   - if you have fixes to current code submit these before Eric tags the
     repository
   - if you agree on having two repositories, I'll try to seggregate the
     imported history from whatever is related to the web page
   - Eric, which are the files/directories related to web page management?

Lluis

-- 
 "And it's much the same thing with knowledge, for whenever you learn
 something new, the whole world becomes that much richer."
 -- The Princess of Pure Reason, as told by Norton Juster in The Phantom
 Tollbooth