greg et al, just to let you know.
i just had to set up, here, a second "partial tag", this time quite a significant rewrite of my database modules and the way they're being used in the project i'm doing. i tagged just the db.py, monitord.py and sql2000xmldb.py files. i then found whoops, a bug in the monitord.py file that needed correcting in both cvs main _and_ the tagged version. so i corrected it in both - making sure that it _was_ exactly the same correction in both. the file monitord.py _does_ also contain other modifications. after performing a merge into cvs main with "cvs update -j dualdbdesign", guess what? no conflicts. the only conflicts i get are in db.py where i forgot that i had renamed a function in one file and added extra arguments to the original _not_ renamed function. ... which is exactly the sort of thing you really _do_ need to catch as a conflict! and during this time, guess what? cvs main remained useable at all times. if i had been asked to perform a demonstration or to perform a release at any time, i would have been confident enough to say "no problem", immediately. hope this helps. luke ----- Luke Kenneth Casson Leighton <[EMAIL PROTECTED]> ----- "i want a world of dreams, run by near-sighted visionaries" "good. that's them sorted out. now, on _this_ world..."
