Re: How we keep in sync with CMake's CVS head (Git repo and instructions)

[E. Wing]

Okay, I mentioned the bridge repo and trying to share it.

I setup a Git repo hosted at repo.or.cz.

http://repo.or.cz/w/CMakeLuaTailorHgBridge.git

Only people trying to resync CMake's official CVS to our CMakeLua repo
need to concern themselves with this.

You will need CVS, Git, Mercurial, and Tailor installed. (Yes, Yikes! I know).

The steps are:

1) git clone http://repo.or.cz/r/CMakeLuaTailorHgBridge.git YourBridgeRepo
2) cd into the root directory of the bridge repo where CMakeLua.tailor resides.
3) run: tailor -D -v --configfile CMakeLua.tailor
(This pulls from CVS and populates the Mercurial info.)

4) cd to your Assembla/Mercurial CMakeLua repo
If you don't already have one, clone one doing:
hg clone http://hg.assembla.com/CMakeLua YourCMakeLua

5) hg pull <path-to-YourBridgeRepo/CMakeLua>
6) Do a hg update or hg merge as necessary.
6b) If merge conflicts appear, manually resolve them.

7) hg commit
8) hg push
This will send your changes back to the main Assembla repo.

9) cd back to YourBridgeRepo.
10) git commit
11) git push ssh://<username>@repo.or.cz/srv/git/CMakeLuaTailorHgBridge.git
master
This will send your updates back to the git repo.

One note, because CVS is not a distributed repo, I don't know what
will happen if two people try doing a CVS update via Tailor and then
try merging. Probably the safest thing to do is only one person at a
time, i.e. announce you are updating or assign a person to the task.
(Right now it is me, but I don't mind if somebody else wants the job.)

To get access to the Git repo, you will need to register at repo.or.cz
and tell me your username. You will also need to provide repo.or.cz a
public ssh key to write when you sign up. (They don't seem to support
passwords.)

Git:
http://git.or.cz/

Mercurial:
http://www.selenic.com/mercurial/wiki/

Tailor:
http://wiki.darcs.net/DarcsWiki/Tailor

Tailor info:
http://progetti.arstecnica.it/tailor/browser/README.rst

Thanks,
Eric