Re: sync repositories

[Kaz Kylheku]

On Thu, 10 Oct 2002, Eric Siegerman wrote:

> Now we have to do the same thing.  Not full synchronization,
> actually -- every revision, log message, and tag replicated.  All
> we really need is that two sites be able to work on the same
> modules without stepping on each others' feet, and without being
> able to share a CVS repo.
> 
> (We have to do it this way for political reasons, so digression
> into why we "shouldn't" have to, or technical suggestions on how
> to reduce it to a single repo, would NOT be helpful, i.e. I
> already know about ssh.  I'm going to suggest BitKeeper, but I
> very much doubt they'll go for it.  In short, I'm probably stuck
> with disconnected CVS, whether I like it or not.  Bleah.)

In Meta-CVS, you can track third party code on any branch quite
easily. This has nothing to do with CVS vendor branching; it is not
based on the cvs import command. Here is the rundown:

    cd snapshot
    mcvs grab -r branch-name module-name

    # We now have a working copy checked out to branch-name.
    # The changes that will bring the snapshot into the branch look
    # like ordinary local edits that can be diffed, modified and
    # committed.

    mcvs ci   # commit; third-party snapshot is now in the branch

    mcvs sw   # switch to main trunk
    mcvs merge branch-name  # merge the branch
    mcvs ci   # commit, done

I would give each time their own repository, and have them use a branch
to track code snapshots from the other team.