On Wed, 2002-07-03 at 01:54, Eric Anholt wrote: > CVSROOT: /cvsroot/dri > Module name: xc > Repository: xc/xc/programs/Xserver/hw/xfree86/os-support/shared/drm/kernel/ > Changes by: anholt@usw-pr-cvs1. 02/07/03 00:54:13 > > Log message: > Merge from trunk to bsd-3-0-0-branch.
I've tried to do this as correctly as I could, but I don't get along too well with CVS. I've tried to be as correct as possible with it, including looking at the cvs diff and the diff -ru to trunk, along with making World and testing radeon DRM. I've laid down a tag in trunk (trunk-20020703), which wasn't done before and isn't listed in the cvs instructions on the webpage. Not having a nice trunk tag might have been part of the issue for why this merge was difficult for me (I ended up having to do cvs update -d -j HEAD for most of it, which conflicted with the previous merge). It's suggested as something to be done according to "info cvs". I didn't lay down the freeze tag (oops) before commit, and I haven't tagged the branch after commit. Are these tags just for isolating problems caused by the merge? -- Eric Anholt <[EMAIL PROTECTED]> http://lclark.edu/~eta/dri/ ------------------------------------------------------- This sf.net email is sponsored by:ThinkGeek No, I will not fix your computer. http://thinkgeek.com/sf _______________________________________________ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
