Comments on: git question

By: Matěj Cepl

Matěj Cepl — Thu, 16 Apr 2009 10:38:42 +0000

I like http://live.gnome.org/Empathy/Git … I think they do excellent job in explaining real world scenarios well.

By: Victor Bogado

Victor Bogado — Wed, 15 Apr 2009 22:23:43 +0000

The rebase changes the base of your branch, if your topic branch is based on the head (master branch) of the upstream repository when it is “assimilated” and your private branches are all based on top of the topic that was assimilated you will have no problem.

before rebase :
o-o-o-(origin/master)-o-o-o-(master)-o-o-o-(topic)

after 2 rebases:

o-o-o-(origin/master)-o-o-o-(topic)-o-o-o-(master)

after upstream assimilation :

o-o-o-o-o-o-(origin/master)(topic)-o-o-o-(master)

By: juanje

juanje — Mon, 13 Apr 2009 23:55:20 +0000

@bartman: THank you very much. Probably the solution goes that way. I’ll read it your talk and then probably email you to be sure I undertand it well.

I think one of my problems (apart of the English is sometimes hard for me and I miss some concepts) is that I believe I don’t understand well the “rebase” concept…

Thanks again

By: bartman

bartman — Mon, 13 Apr 2009 23:50:25 +0000

I meant to say that *you* will have to rebase all your topic branches onto the new upstream.

By: juanje

juanje — Mon, 13 Apr 2009 23:48:42 +0000

@Garth: I think it’s quite similar to what I do, but which parents do you use? the upstream mirror?
What happen when you made modifications over a feature which is not in upstream but in another branch? The parent will be that branch, won’t be?
But then, imagine that you did something in the branch of the branch, the branch with the new feature based in the branch which you didn’t push to upstream and that change you yes like to push to upstream?
Well, maybe this was happen to me because I use a middle branch which has merged the mirror branch with the features I was developing in different branches. But I did that because I need all those features together and I don’t know another way to do that

By: bartman

bartman — Mon, 13 Apr 2009 23:48:28 +0000

I am not 100% sure I know what you are asking, but I’ll need to rebase all your “topic” branches onto the new upstream, and then remerge them into your master.

Email me if you need some help, it’s much easier to draw diagram in ascii

Here is my talk on git from last year. It has some diagrams on how git rebase works:
http://excess.org/article/2008/07/ogre-git-tutorial/

By: juanje

juanje — Mon, 13 Apr 2009 23:39:13 +0000

@Vadim: Actually, I didn’t try for awhile Gitorious so I’ve just tried and I got very surprised because there are some many new cool features. I think I’ll give it another chance

By: Garth

Garth — Mon, 13 Apr 2009 23:26:37 +0000

My way to do this (from a general DVCS perspective) is to have your upstream mirror, a branch off of that for your change to be pushed and any more branches below that for you to work within. Each set of patches would be in a different branch, using parents to represent dependencies so you don’t have to cherry pick certain patches out when you want to upstream them.

By: juanje

juanje — Mon, 13 Apr 2009 23:10:16 +0000

@Vadim: I knew Gitorious already and I think that I saw before repo.or.cz and unless github is not open source it has a huge amount of free software project (or just open piece of code) there.
The thing I like from Github is how easy you can manage your branches, follow people, projects, fork from their projects and still be connectd with the mainline so both (upstream side and downstream side) can know when the other side makes something new and maybe useful for your branch. I didn’t see that in any other repository managment project.

And al my projects and contributions are free software so I have not the problem you pointing out in your screenshot. Anyone can always download, fork, merge, and so on from my branches, even request me to pull some of their changes.
The best thing is this is just with feww clicks, very visual and with a lot of good documentation.

Anyways, Github is just a service and has some issues I don’t like as well, but for me is the best web interface for this kind of systems. But I’m very open to others alternatives.
Loggerhead for Bazaar is pretty good as well, but I miss the easy way of “fork” from a branch and to have a graphical way to do merging, as github have. But at least Loggergead is open and free and is still improving.

By: Vadim

Vadim — Mon, 13 Apr 2009 22:46:08 +0000

Just to make sure that you know about alternatives:

http://gitorious.org/
http://repo.or.cz/

Just because githubs random 404′s when attempting to download the file as archive or commercial obnoxiousness: http://vadi2.files.wordpress.com/2009/04/screenshot_100618.png can be annoying to your future contributors.