On Wed, Feb 16, 2011 at 06:18:32PM -0800, Jason Gerecke wrote: > After consulting with Ping, the CVS repositories are going to be > retired. With SourceForge hinting at a possible end-of-life for CVS > service it seems like a good idea to take a preemptive step and > consolidate everything under Git.
\o/ > However, while preparing the pull the plug I've run into a small snag: > the legacy linuxwacom code is hosted in three repositories that all > disagree to some extent. The linuxwacom-dev and linuxwacom-prod > repositories on CVS are the most up-to-date as far as version tags go, > but have different histories and tags. The linuxwacom repository on > Git is slightly less up-to-date, but does have a few patches the > others don't -- including the complete removal of kernel code. any other patches than removing the kernel code? if not, that could be recreated quickly. unless there's a huge number of patches, I recommend ignoring the git repo and focusing on the most up-to-date one. > Any thoughts on which version we want to use, or how we should merge > the code/commits/tags between them? first, my suggestion is that if you plan to continue with -prod and -dev to merge them both into a single repository, with -prod on a branch where you regularly cherry-pick/merge the patches suitable. not sure if git cvsimport does this nicely, but it's worth a try I guess you plan to keep the current "one repository for everything" instead of splitting it up into logical units (kernel, xdrv, the various utilities)? you probably already know this but I use this command to import the linuxwacom tree into the linuxwacom branch on my repo: git cvsimport -u -v -d :pserver:anonym...@linuxwacom.cvs.sourceforge.net:/cvsroot/linuxwacom -o linuxwacom linuxwacom-dev Cheers, Peter ------------------------------------------------------------------------------ The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
