On Tue, Mar 02, 2010 at 08:45:58AM -0600, Chris Bagwell wrote: > At this point I do not think the bamboo branch should ever be directly > merged back over to master.
uhm, without trying to be rude but yes, I agree with that. the patches are a bit messy and need some serious rebasing and cleanup before being mergable. (that's from when I looked at it about 7-10 days ago) Cheers, Peter > The patches do not align with those you've submitted to linuxwacom anymore > and I've been cherrypicking the very important ones and getting them > submitted to xf86-input-wacom master. Its good to keep around short term > for end users while we work threw the following issues. > > The only important bamboo patch left is the fix to GetRange()'s which > you've already signed of on, BTW. This will get you touch+pen working > good but with occasional pointer jump for touch. > > What that will leave in bamboo branch only is gesture logic pretty > much limited to wcmTouchFilter. You've clean that file up a lot and I > did my version of a re-write and working threw the two approaches will > take some time. I started to break your gesture changes up into > mini-patches for review but have stopped until I was sure the first > round of patches were in. > > BTW, when you have some time, I'd like to discuss gestures and what we > want to support in wacom. I find it hard to discuss what are bugs and > what are features without understanding what we want it to do first. > > Let me know when you have time to think about that topic in depth. > > Chris > > On Mon, Mar 1, 2010 at 10:54 PM, Ping Cheng <[email protected]> wrote: > > Hi Chris, > > > > Do you feel your bamboo branch is in the position to merge back to the > > master? If there is not much you can do on that branch, I think you > > can merge it back. This would make the porting from xdrv to > > xf86-input-wacom a bit easier for you, I hope. > > > > Ping > > > > On Tue, Feb 16, 2010 at 6:57 AM, Chris Bagwell <[email protected]> wrote: > > > >> already has small patches that can be easily reviewed) and cherry pick > >> Ping's improvements in linuxwacom and submit those as additional > >> patch. Reviewing the alignment patch will probably be confusing > >> without context of original patches. > >> > >> Or I need to rework Jason's patches to include Ping's improvements > >> spread out over related smaller patches. The main issue here is I'll > >> have to edit a remote git repo's history which will confuse anyone's > >> clone's. > > ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
