On Fri, 2003-10-03 at 13:55, Felix Kühling wrote: > On Fri, 03 Oct 2003 12:14:32 -0700 > 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 > > Are you referring to the patch that Rafael Máximo sent yesterday? I was > going to look at it, but I didn't have time yet. After a quick glance it > looks like it reverts lots of changes S3 made to the driver. > > > 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? > > This is probably related to keyword substitutions. There is a node > "Merging and keywords" in the CVS info documentation. Basically you > should add "-kk" to the cvs update command line. This way keywords are > not substituded and can't cause phantom conflicts.
The -kk didn't seem to help at all (cvs up -kk -d -j HEAD). I still got "C " in 537 files. -- 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
