Re: How to get Log messages between two tags usind cvs log command?

2002-05-30 Thread Jonathan Kamens
Use cvs rdiff -s to get a summary of the changes between the two tags, and then parse its output and use rlog to retrieve the log messages for the indicated revisions of the indicated files. Check out URL:http://www.mit.edu/~jik/cvsrdiffsum, which will do this for you automatically and produce a

Re: problems merging from branch to mainline

2002-05-30 Thread Jonathan Kamens
I'm having some trouble merging from a branch to the mainline. The latest branch version is 1.1.2.9, while the latest mainline version is 1.2. I'm running this command from a checked-out copy of the mainline: cvs update -j1.1.2.9 foo.jsp What I expected to happen was file 'foo.jsp' would be