On Mon, 26 Jan 2004, Andrew C Aitchison wrote: > > > Even though I have XFree86 CVS commit access, I do most of my new > > > work in a separate tree, which I keep in sync with the XFree86 > > > tree. I don't find this to be a significant burden.
> > Sure, I don't do actual development in that tree either. But when I am > > done I need to the code into the official tree to avoid major patching > > and integration headaches in the future. For you that is easy, since you > > can just commit your changes into the primary tree. > I doubt that I do as much development work as you, but I've found > CVS's merging reliable enough that I can afford to do a CVS update > into my development tree every night. When the update touches lines > that I have also changed, it handles the conflict well enough that > it is easy to sort out. You are definitely more trusting of CVS than I am... I _never_ use a checked out tree for development. Marc. +----------------------------------+-----------------------------------+ | Marc Aurele La France | work: 1-780-492-9310 | | Computing and Network Services | fax: 1-780-492-1729 | | 352 General Services Building | email: [EMAIL PROTECTED] | | University of Alberta +-----------------------------------+ | Edmonton, Alberta | | | T6G 2H1 | Standard disclaimers apply | | CANADA | | +----------------------------------+-----------------------------------+ XFree86 developer and VP. ATI driver and X server internals. _______________________________________________ Devel mailing list [EMAIL PROTECTED] http://XFree86.Org/mailman/listinfo/devel