[haiku-development] Re: merge branch

  • From: "maxim.sokhatsky@xxxxxxxxx" <maxim.sokhatsky@xxxxxxxxx>
  • To: "haiku-development@xxxxxxxxxxxxx" <haiku-development@xxxxxxxxxxxxx>
  • Date: Wed, 19 May 2010 17:37:46 +0000

-----Original Message-----
From: Andreas Färber
Sent:  19.05.2010, 18.01 
To: haiku-development@xxxxxxxxxxxxx
Subject: [haiku-development] Re: merge branch


Hi Niels,

Am 18.05.2010 um 11:09 schrieb Niels Reedijk:

> My next developer-tools project is going to be an hg<->svn bridge. I
> hope to deliver a proof-of-concept soon (which would then also be
> useful for a git<->svn bridge). The difference from hgsvn and
> hgsubversion is that it is all done server-side, meaning the end user
> does not have to bother with the logistics that it all involves.

Is there really a need to do this for git?

git-svn supposedly works fine in both directions. You can work and  
test on a real git branch and when things are ready rebase it onto an  
SVN branch (trunk) and turn those commits into SVN commits.
http://www.kernel.org/pub/software/scm/git/docs/git-svn.html

For my Mono development I use git just for development and then use  
`patch -p1 | git format-patch ...` on an svn working copy for checkin,  
to adapt the commit messages with the legal stuff.

The number of Haiku committers is not that large anyway...

Andreas



Other related posts: