FWIW, the 2D drivers from the trunk and the code drop from VIA are VERY different. I'm not sure where you are seeing the conflicts... just an FYI...
--- Eric Anholt <[EMAIL PROTECTED]> wrote: > Okay, I was going to merge trunk to the savage-1_0_0-branch, since > updates to the savage driver in trunk help out with that work I've > been > told. I went to the CvsPolicy wiki page and based on that did a tag > on > the savage branch of savage-1_0_0-trunk-premerge. Then I did cvs > update > -d -j HEAD. It ran for a while, and produced a large number of > conflicts. Why should there be conflicts in files that weren't > touched > by the savage-branch? Is there a way to avoid having to deal with > all > of those? > > -- > Eric Anholt [EMAIL PROTECTED] > http://people.freebsd.org/~anholt/ [EMAIL PROTECTED] > > > > > ------------------------------------------------------- > This sf.net email is sponsored by:ThinkGeek > Welcome to geek heaven. > http://thinkgeek.com/sf > _______________________________________________ > Dri-devel mailing list > [EMAIL PROTECTED] > https://lists.sourceforge.net/lists/listinfo/dri-devel __________________________________ Do you Yahoo!? The New Yahoo! Shopping - with improved product search http://shopping.yahoo.com ------------------------------------------------------- This sf.net email is sponsored by:ThinkGeek Welcome to geek heaven. http://thinkgeek.com/sf _______________________________________________ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
