Re: Moving to Git

[Alexandre <airmind gmail com>]

On Fri, Apr 17, 2009 at 19:04, John Stowers <john stowers gmail com> wrote:

On Sat, Apr 18, 2009 at 8:45 AM, Alexandre <airmind gmail com> wrote:

Hi,

Now that Gnome moved to git, I wanted to move my branches to the Gnome git. I understood the procedure to move the changes from one branch to another (I havent done it yet, so I dont know if it'll work for me),

This may also be helpful http://live.gnome.org/Empathy/GitMigration

but I dont quite understand how to move my branches to Gnome git. For instance, I have some branches in my GitHub account: http://github.com/airmind/conduit/tree, but I dont want to move all of them to the Gnome git, as some of them are not very useful and others I was testing patches.

This is a confusing situation, becase AIUI

1) you will need to recreate your github repo to be a clone of gnome git,
a) Backup your local clone of github
b) Deleting your existing github repo from the web interface
2) Rebase your existing repos onto the new clone
3) Push all branches to github
4) Push selected branches to gnome

I really want Jc2k to explain to you how to do this, as he wll need to move his own conduit repos from github to gnome now, or at least he will need to rebase them.

Hm, ok, I think I understand what you mean. I'll try it out later. Maybe John Carr can help us out?
 

But I still want to have the ability to create public and temporary branches, for testing patches and other small changes. Do Gnome provide some kind of personal repository for my branches? I'm not sure that is even what I want.

Well to create a branch on gnome git, just push to it

git clone git://git.gnome.org/conduit
git checkout -b new-branch
git push origin new-branch

Anyway, could someone explain to me or point me somewhere else I can know more about the commit workflow now that Gnome moved to git? For instance, how does the prepare-Changelog script works with Git?

I am still deciding what to do with the ChangeLog.

I think we can just deal with the pain of updating it manually for now, until the next release. After then I will auto-generate it from the git commit log. I will release the next release (0.3.16) when
* The new config stuff has been completed (required for all dataproviders except FileModule)
   - And the Dbus interface has been ported to work with it

I've been meaning to post this for a while but forgot about it. I made a list of currently not converted modules (automatically with a test script). It's not 100% accurate, and it doesnt mean a module not on the list is working, it just mean it has been converted (I tried all of the converted modules and they worked for me). Here is the list of missing modules for the master branch:

[FAIL] Google Contacts *
[FAIL] YouTube *
[FAIL] Folder *
[FAIL] Backpack Notes *
[FAIL] Shutterfly *
[FAIL] Picasa *
[FAIL] Facebook *
[FAIL] Files
[FAIL] SmugMug *
[FAIL] Banshee Playlists *
[FAIL] Google Documents *
[FAIL] Test Need Configure

Modules with * means I already worked on them, but they are either broken or incomplete. Specially the Google module requires the new-settings branch and some more work. The other were in my config-unstable branch, which I have to port to the Gnome Git as soon as possible (probably manually from the github branch).

I havent worked in the DBus interface yet.

* The new settings serialization stuff has been finished (see new-settings branch)

I'm still seeing some bugs moving from the old settings file to the new one. I'm still unable to track down the reason.
 
Alexandre Rosenfeld