Re: CVS Merge problem - will not merge in new code

2001-02-15 Thread John Mocyk
. The files only reside on the branches and tags but not on the MAIN trunk. I guess I need to move all these files to the main trunk and do this for any new files that are created in the future on my main branch.. The joy's of learning Thank You John "Derek R. Price" wrote: John Mocyk wrote

CVS Merge problem - will not merge in new code

2001-02-14 Thread John Mocyk
I get this message when I am trying to update a branch (same message if from a static tag or branch) and it seems to occur with some of the new files. The branch is just a project that is being worked on and the statictag is a tag of what was released into production and is code at production

Please remove my email from your mailing list

2000-09-28 Thread John Mocyk
begin:vcard n:Mocyk;John tel;fax:(604)482-5722 tel;work:(604)482-5742 x-mozilla-html:FALSE org:Telus Advanced Communications;Internet Services adr:;;4 -- 4595 Canada Way;Burnaby;BC;V5G 1J9;Canada version:2.1 email;internet:[EMAIL PROTECTED] title:Release Manager fn:John Mocyk end:vcard

rdiff on a branch from head of branch to another date on same branch.

2000-08-30 Thread John Mocyk
What I am trying to do is to see what files have changed on a branch from a date stamp on that branch. If I run cvs rdiff -s -r Branch_tag -D Date Module This compares the difference from the branch tag and a date on the Main trunk. I do not see any way to get this to check the date on the