Migrating from CVS to Git
I'm investigating what needs to be done to switch us from CVS to Git. So far I've done:
- Set up a shared repository (current people with commit access:
bame,carlos,deller,grundler,jejb,kyle,rbrad,tausq,varenet,willy others will be added on an ad-hoc basis)
- Changes made to that repository get sent to the p-l-cvs mailing list
- The repo is visible via gitweb: http://git.parisc-linux.org/
- Changes are linked from the mailing list
What needs to be converted?
- Tagging. It's now essentially free. A tag in git terms is just a ref. You can add them at any point. So we need to figure out what we want to bless as good.
- Autobuilding. This can change slightly as a result of how different tagging is. Do we want to just build every time there's a commit? It'd be a bit wasteful, but CPU and disk is cheap.
- Documentation. There's the git tutorials to link to, but something specific to "Here's how you work on the p-l tree" would make the learning curve less steep.
- Merging to Linus. This should hopefully be an easier process, being easier to cherry-pick changesets out of our shared repo.
- Merging from Linus. We can now pull whenever we like, but how often should we pull, and what bits of Linus' dev tree do we want to inflict on our users? ;-)
I'm sure there are other things that need to be converted and discussed.
_______________________________________________
parisc-linux mailing list [email protected]
http://lists.parisc-linux.org/mailman/listinfo/parisc-linux
Quoted 9 lines · Matthew Wilcox
I'm investigating what needs to be done to switch us from CVS to Git. So far I've done:
- Set up a shared repository (current people with commit access:
bame,carlos,deller,grundler,jejb,kyle,rbrad,tausq,varenet,willy others will be added on an ad-hoc basis)
- Changes made to that repository get sent to the p-l-cvs mailing list
- The repo is visible via gitweb: http://git.parisc-linux.org/
- Changes are linked from the mailing list
thanks!
Quoted 5 lines
What needs to be converted?
- Tagging. It's now essentially free. A tag in git terms is just a ref. You can add them at any point. So we need to figure out what we want to bless as good.
This is a distro problem. We should tag anything we change in the tree.
Quoted 2 lines
- Autobuilding. This can change slightly as a result of how different tagging is. Do we want to just build every time there's a commit?
Something that anyone who has write access can trigger. Just need to make sure we "commit" sets properly.
Will the Makefile commit will no longer trigger the auto-builder?
Quoted 4 lines
It'd be a bit wasteful, but CPU and disk is cheap.
- Documentation. There's the git tutorials to link to, but something specific to "Here's how you work on the p-l tree" would make the learning curve less steep.
Thanks - I think what you already wrote should be sufficient for now:
http://www.parisc-linux.org/faq/git.html
If someone is disappointed, please clone the content to wiki.parisc-linux.org and improve it.
Quoted 5 lines
- Merging to Linus. This should hopefully be an easier process, being easier to cherry-pick changesets out of our shared repo.
- Merging from Linus. We can now pull whenever we like, but how often should we pull, and what bits of Linus' dev tree do we want to inflict on our users? ;-)
-rc releases is sufficient for me unless we some infrastructure broken that needs faster turn-around to linus. I'm thinking of the spinlock breakage that occurred when mingo's latest cleanup went in.
Quoted 1 line
I'm sure there are other things that need to be converted and discussed.
Given you already have gitview running, the auto-builder is the only other tool I can think of.
thanks,
grant
_______________________________________________
parisc-linux mailing list
[email protected]
http://lists.parisc-linux.org/mailman/listinfo/parisc-linux
Quoted 5 lines · Grant Grundler
Quoted 3 lines
- Tagging. It's now essentially free. A tag in git terms is just a ref. You can add them at any point. So we need to figure out what we want to bless as good.
This is a distro problem. We should tag anything we change in the tree.
We don't need to any more. We have a sha1 number (which is part of the commit mail) that allows us to recover the state of the tree after any commit.
Quoted 6 lines
Quoted 2 lines
- Autobuilding. This can change slightly as a result of how different tagging is. Do we want to just build every time there's a commit?
Something that anyone who has write access can trigger. Just need to make sure we "commit" sets properly.
Will theMakefilecommit will no longer trigger the auto-builder?
I was hoping we'd no longer have to do Makefile commits. Maybe we still want to, though?
Quoted 5 lines
Thanks - I think what you already wrote should be sufficient for now:
http://www.parisc-linux.org/faq/git.htmlIf someone is disappointed, please clone the content to wiki.parisc-linux.org and improve it.
I thought about doing it on the wiki to begin with, but thought we should have the git docs somewhere official first.
Quoted 3 lines
-rc releases is sufficient for me unless we some infrastructure broken that needs faster turn-around to linus. I'm thinking of the spinlock breakage that occurred when mingo's latest cleanup went in.
I was thinking along similar lines.
_______________________________________________
parisc-linux mailing list
[email protected]
http://lists.parisc-linux.org/mailman/listinfo/parisc-linux
Quoted 10 lines · Matthew Wilcox
Quoted 6 lines
Quoted 2 lines
- Autobuilding. This can change slightly as a result of how different tagging is. Do we want to just build every time there's a commit?
Something that anyone who has write access can trigger. Just need to make sure we "commit" sets properly.
Will theMakefilecommit will no longer trigger the auto-builder?I was hoping we'd no longer have to do
Makefilecommits. Maybe we still want to, though?
I dunno, maybe it would be easier to just manually thunk the autobuilder with a commit id whenever we feel it's justified, and let the autobuilder worry about the incrementing -pa numbers? There's an embedded CONFIG option that will embed the commit sha1sum in the kernel version, turning this on in defconfigs would be good for everyone who pulls our tree from git.
Btw, if no one has used it yet, the git bisect stuff is pretty darn cool.
_______________________________________________
parisc-linux mailing list [email protected]
http://lists.parisc-linux.org/mailman/listinfo/parisc-linux