[Nix-dev] New HOWTO: introduction to TopGit
Marc Weber
marco-oweber at gmx.de
Thu Jun 3 02:38:22 CEST 2010
Hi list,
I wrote a new HOWTO giving a small introduction on how to use TopGit.
http://wiki.nixos.org/wiki/Nixpkgs_and_TopGit
This could be a fast way how patches can be optimised by all of us
without much talking.
The workflow could be:
- fetch
- fix
- push
- maybe notify
I'll add a new TopGit branch making nixpkgs builders aware of NUM_CORES
soon. I think that's a nice "topic".
Short story:
===========
The interesting thing about TopGit is that it assumes that your topics
are not stable and will be fed upstream later.
Thus if you have "topics" which would look like this in SVN
-rev 10: add builder
-rev 11: add package depending on builder
-rev 12: add package depending on builder and previously added package
you can go pack and make a change to the -rev 10 commit.
Then you update revs 11,12 so that they get the changes as well using
"tg update"
Those revs 10,11,12 are represented as branches in git. That's why you
can amend changes easily.
When you think you have finished you export those patches and commit
them upstream.
Thus if you see commits labeled t/foo it was me who was too lazy
removing those topGit headlines in commits.
I'll update qgis this way soon.
Marc Weber
More information about the nix-dev
mailing list