On 01/13/2011 08:58 AM, Wolfgang Grandegger wrote: >> I've just activated the git feature on berlios. It'l take up to 6 hours >> for the scripts to create the initial directory. > > Thanks. > >> The next step could be to import the svn history of the can-utils into >> git. What are the preferred svn username to git author addresses? >> >> thuermann >> wolf >> hartkopp > > Do we need a preferred username? I know that finding a reasonable GIT > author for SVN commits is difficult. If yes, the SVN commit user name > would be fine.
That's not so complicated. Have a look at: http://git.pengutronix.de/?p=mkl/berlios-can-utils.git;a=summary In the Kernel you're using "Wolfgang Grandegger <wg at grandegger dot com>", is this okay for socketcan also? Oliver now uses "Oliver Hartkopp <socketcan at hartkopp dot net>", but used "oliver at" previously. > What is you proposal/idea for the new git tree. Do we want to convert > everything? Well, a cleanup and restructuring could also be done later. My idea is to create a seperate git repo for the seperate stuff we have in the kernel. > My idea for consolidated can-utils and kernel drivers are: > > trunk/utils : Consolidated set of CAN utils for distros "trunk" is a svn term and not to be used in git :) I'd start with a git repository that imports the history of "http://svn.berlios.de/viewvc/socketcan/trunk/can-utils/";. Just like the git repo (http://git.pengutronix.de/?p=mkl/berlios-can-utils.git;a=summary) at pengutronix, but with the git author email addresses you prefer. What about "https://svn.berlios.de/viewvc/socketcan/trunk/test/";? We can make a seperate git repo, clean up and merge it into the can-utils repo. > trunk/lib : libsocketcan for distros I'd use http://git.pengutronix.de/?p=tools/libsocketcan.git;a=summary as is. Then eventually merge into can-utils. > trunk/examples : Other useful CAN utils and examples (not for distros) > trunk/scripts : socketcan-utils.spec, etc. > trunk/kernel/... out off-tree drivers for Linux 2.4 and 2.6 Two git repos, one for 2.4 the other for 2.6. Regards, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Socketcan-core mailing list [email protected] https://lists.berlios.de/mailman/listinfo/socketcan-core
