On 08/16/10 09:12, Benjamin Wolsey wrote: > > I have a huge bunch of changes that aren't yet ready to commit to > trunk. If someone can help me getting them imported into git I don't > need the savannah branch, except that I've no idea how well it will > merge if the git branch diverges too much from the current bazaar > one.
Right now the git master and bzr trunk are mostly in sync other than a few minor changes I've made. I've been using http://github.com/termie/git-bzr-ng to keep bzr and git in sync. git-bzr-ng will pull in all the changes made in bzr, and import them into git, so it should "just work". At least it's been working for me so far. :-) I also have a Launchpad branch I need to import, but wasn't planning on this till after the release. Right now I'm doing BSD testing, since nobody else seems to be helping with this... :-( Currently the release branch is stable, and without the media changes that are causing problems. So feel free to import into master. It doesn't matter whether you import from Launchpad or savannah into git. - rob - _______________________________________________ Gnash-dev mailing list [email protected] http://lists.gnu.org/mailman/listinfo/gnash-dev

