Was just re-reading my patch this morning, this part: ! cannot commit to a specific revision on a branch. Note, ! `.trunk' is valid as a branch tag for the `-r' option, and ! will commit the file as the newest revision on the trunk. ! @c ! @c However, if the file in the working directory has a ! @c sticky tag other than .trunk, the sticky tag will not ! @c be changed, and even if the file differs from the repository ! @c revision, it will be marked 'up-to-date', ! @c and a subsequent 'cvs commit' will not commit those changes. ! @c no doubt this is a bug, though I'm not sure what the right ! @c fix, is, either change the sticky tag, or leave the file's ! @c status as 'locally-modified'. ! @c ! is not accurate. I had changed this section but I didn't hit ":w" before running "cvs diff" I guess. What's described here is the bug in "cvs commit -r .trunk" in the earlier patch that I fixed with the 7-9-2000 patch. Using "cvs commit -r branchtag" was a bit confusing to me when I was playing with it. It seemed to work well with newly added files, but for existing files, I would always get "up to date check failed", which I think makes sense. I think for "cvs commit -r branchtag" to work with the working directory on another branch, the file in question must be on both branches, but have revisions unique to neither branch, so that the revision on each branch and in the working directory are identically the same revision, or, the file must be newly added so that it is on neither branch prior to the commit. Is there any other case where "cvs commit -r branchtag" will not give "up to date check failed" and allow the commit to proceed? I couldn't find any other case. -- steve -- steve __________________________________________________ Do You Yahoo!? Get Yahoo! Mail � Free email you can access from anywhere! http://mail.yahoo.com/
