Re: [Xf4vnc-devel] Convert xf4vnc repo to git?

[Alan H. <al...@fa...>]

Dan,

I think we all know the benefits of git and feel free to keep your git
repositories around, but given the frequency of changes to xf4vnc I
think keeping it in CVS on SF is no big deal. 

Alternatively, we could see if there's any argument to putting xf4vnc on
a branch within the main xorg repository. That way, it's even easier for
merges to happen and xf4vnc gets a little more visibility, and hopefully
more contributors.

I'm planning on merging Xserver 1.5 once that's been released as stable.

Alan.

On Wed, 2008-07-09 at 20:51 -0700, Dan Nicholson wrote:
> Hi,
> 
> I've been keeping a patch for xf4vnc against xorg for a while, and it
> was painful to keep it updated. I spent some time today converting the
> CVS modular repo to git repos for each module. They can be cloned from
> here:
> 
> git://anongit.freedesktop.org/~dbn/xf4vnc/xf4vnc.git
> git://anongit.freedesktop.org/~dbn/xf4vnc/proto/vncproto.git
> git://anongit.freedesktop.org/~dbn/xf4vnc/proto/xcliplistproto.git
> git://anongit.freedesktop.org/~dbn/xf4vnc/lib/libvnc.git
> git://anongit.freedesktop.org/~dbn/xf4vnc/lib/libXcliplist.git
> 
> The procedure was to first convert with git-cvsimport then use
> git-split[1] to break it into modules. The master branch in xf4vnc.git
> matches CVS HEAD exactly. I made a cleanup branch that removes dead
> and generated files, reduces the diff to xorg, and adds a couple minor
> fixes I saw. The xorg branch is actually xorg commit 34b69e (trunk
> 20080306 AFAICT), and I've moved the manual xorg branch to Xorg-old. I
> was able to create a very clean diff against the last xorg merge that
> Alan did:
> 
> http://people.freedesktop.org/~dbn/xorg-server-xf4vnc.patch
> 
> Would anyone be opposed to converting the xf4vnc repo to git? I can
> think of a lot of advantages to doing this outside of "I like git
> better than CVS".
> 
>  * Since xf4vnc is essentially a fork of xorg, it makes sense to be in the same
>    repository format.
>  * The git merging tools are vastly superior to CVS, meaning that merging from
>    xorg upstream is trivial. Having done some manual merge resolution today to
>    get the git repo setup, I can't imagine how painful this has been.
>  * The full xorg history is included (almost, some of the merging
> caused the short
>    xf4vnc history to be preferred).
>  * Pulling and pushing to xorg is clean and simple.
>  * There's a nice separation of modules so that vncproto and friends can evolve
>    separately from xf4vnc (or not).
> 
> What I think is the killer feature is that you can diff and branch
> against any revision of xorg. It's trivial to find out what's in
> xf4vnc vs. xorg master or any tagged version of xorg.
> 
> Anyway, I obviously think it would be a benefit to do this, but I'll
> keep the git repos around even if you guys would rather stay with CVS.
> Let me know what you think.
> 
> --
> Dan
> 
> [1] http://people.freedesktop.org/~jamey/git-split
> 
> -------------------------------------------------------------------------
> Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
> Studies have shown that voting for your favorite open source project,
> along with a healthy diet, reduces your potential for chronic lameness
> and boredom. Vote Now at http://www.sourceforge.net/community/cca08
> _______________________________________________
> Xf4vnc-devel mailing list
> Xf4...@li...
> https://lists.sourceforge.net/lists/listinfo/xf4vnc-devel