Yabause-rr

From Yabause
Jump to: navigation, search

This page is intended to be a place for all discussions about the possible merge of the -rr branch with the main Yabause project.

VCS

Yabause is currently using CVS while -rr is using Subversion. Moreover, A number of contributors asked that we update our CVS to something a bit more modern than CVS. What are we going to use?

CVS

  • +0.25 for BlueCrab (Dreamcast port maintainer) (BlueCrab 22:16, 27 May 2009 (UTC))

Subversion

  • +1 for me ;) Pasnox 20:27, 27 May 2009 (UTC)
  • +0.3 for Zhenech (debian package maintainer) (Guillaume 20:32, 27 May 2009 (UTC))
  • +0.7 for zeromus. the noncontroversial choice Zeromus 20:43, 27 May 2009 (UTC)
  • +0.8 for joostp (presently non-active contributor) (Joostp 21:09, 27 May 2009 (UTC))
  • +0.75 for BlueCrab (Dreamcast port maintainer) (BlueCrab 22:16, 27 May 2009 (UTC))
  • +1 for pa__ (Pa 17:39, 28 May 2009 (UTC))

Git

  • +0.7 for Zhenech (debian package maintainer) (Guillaume 20:32, 27 May 2009 (UTC))
  • +0.3 for zeromus. the controversial choice, more likely to alienate some people. but i think we will all switch to git some day Zeromus 20:43, 27 May 2009 (UTC)
  • +0.2 for joostp (presently non-active contributor) (Joostp 21:09, 27 May 2009 (UTC))

Mercurial

Something else

Don't care

+1 --Cyber Warrior X 20:31, 27 May 2009 (UTC)

Merge

  1. convert the Yabause CVS repository to a Subversion dump
  2. import that dump on a local Subversion server
  3. create a -rr branch from the same revision the -rr project forked
  4. dump the yabause-rr Subversion repository
  5. import that dump into the -rr branch
  6. dump the repository on the local server and upload it to sourceforge

Pros

  • should keep both repository histories
  • the two branches share a common ancestor, so merge operations will be possible

Cons / Problems

  • google code account names should be renamed to the sourceforge account names