Hi Chris, I knew you would ask this question sooner or later. Just as you were "hoping to avoid needing to decompose the changes", I was trying to avoid answering this question....
It is a complicated process, which causes headaches to everyone involved in this project at this moment. I really wanted to keep the two repos in-sync and I have been working nights and weekends since we started to support both the older XOrgs and XOrg 1.7+. But, I am a paid developer. I have deadlines to meet other than maintaining this project. Don't get me wrong. I am not complaining. In fact, I am extremely grateful that people like you are making great contributions to the project. Don't we often say: "It's always darkest before the dawn."? I am hoping for the best. So let's cut the long story short and get to the decision part: Yes, the main developers are suppose to make patches to bring the two repos in-sync on a timely manner; Patches to xf86-input-wacom need to be grouped by functionality, features, or bug fixes for the health of our "next generation"; Common code fixes and common feature support can go to master immediately after reviewed by the list; Bamboo specific features/fixes go to your bamboo branch for now since it is still an on-going activity. And, most importantly, I hope you submit new patches even after reading such a frustrating message. Ping On Mon, Feb 15, 2010 at 7:08 PM, Chris Bagwell <[email protected]> wrote: > Hi all, > > Have you guys developed a strategy for porting updates in linuxwacom's > xdrv over to xf86-input-wacom? Will the main developers occasionally > do that? Will it help to provide a single patch porting, for example, > the updates from the -10 release over to git master? > > The improvements Ping made to Jason's bamboo patches during commit to > CVS make my original direct port of Jason's patches to > xf86-input-wacom bamboo branch no longer match up exactly (especially > for gestures) and I do recommend aligning with these improvements > somehow. I can either provide a small-ish patch to bamboo branch to > make that branch become aligned to linuxwacom or I can provide a > single patch against master branch doing a direct port from linuxwacom > (in which case the bamboo branch becomes unneeded). But these two > versions of alignment patches will not be able to describe in much > details what they are trying to do other then "aligning with > linuxwacom". > > I'm hoping to avoid needing to decompose the changes from 0.8.5-9 and > 0.8.5-10 into mini patches in port over to xf86-input-wacom. > > Chris ------------------------------------------------------------------------------ SOLARIS 10 is the OS for Data Centers - provides features such as DTrace, Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW http://p.sf.net/sfu/solaris-dev2dev _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
