Re: more weirdness with wincvs and cvs
Hi, This was before the time change. Also, there was no sticky tag, we were at the head of the main line. Thanks! ~Christine Anthony Frost [EMAIL PROTECTED] wrote in message news:3bdea0c9$1@balboa Christine Freight [EMAIL PROTECTED] wrote in message xGoD7.25108$[EMAIL PROTECTED]">news:xGoD7.25108$[EMAIL PROTECTED]... Hi All~ A couple of days ago a developer and I noticed the following weirdness with WinCVS and CVS. He was using WinCVS to check in his files. Once checked in, about 1/2 hour later I went to my sandbox and ran an update on a Unix box... How exactly a couple of days ago, and did summer time change for you this weekend? We had fun and games in the office on monday with WinCVS flagging everything as being modified due to the BST-GMT change in the early hours of sunday... Anthony ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: merge or branch?
Thanks Steve. Yep, I created a branch origin tag, so I know where the branch forked off. I appreciate the help! ~Christine Stephen Cameron [EMAIL PROTECTED] wrote in message news:[EMAIL PROTECTED]... From: Christine Freight ([EMAIL PROTECTED]) I am having a dispute with a co-worker over how to do something in CVS. I was wondering if anyone out there can help? Here's the situation: A branch (let's call it branchA) gets created off the main line. Then, at some point in time, a branch (branchB) gets created off of branchA. Development continues down branchA, and a new directory, with new files, gets added and committed on branchA. This new directory is obviously not on branchB, since it was created after branchA was created. Question: how does one get the new directory from branchA onto branchB? I would merge the branchA changes into branchB cvs co -r branchB everything cd everything cvs update -d -j branchB_origin -j branchA new_directory cvs commit -m 'merged new_directory from branchA' You did create a tag (branchB_origin, above) to mark the beginning of branchB, right? Also, partial merges like this, (mergiing in _just_ the new_directory) instead of the whole branch, can make it difficult to keep track of what's merged and what's not later on, so be careful and use tags liberally to keep things straight.. So you'd probably want to tag branchA to indicate which portion was merged into branchB. Something like: cvs rtag -r branchB_origin branchA_merged_to_branchB everything cvs rtag -F -r branchA branchA_merged_to_branchB new_directory so that future merges from A to B could use this tag as a starting point and not have re-merge the same changes again. -- steve __ Do You Yahoo!? Listen to your Yahoo! Mail messages from any phone. http://phone.yahoo.com ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
merge or branch?
Hey Folks~ I am having a dispute with a co-worker over how to do something in CVS. I was wondering if anyone out there can help? Here's the situation: A branch (let's call it branchA) gets created off the main line. Then, at some point in time, a branch (branchB) gets created off of branchA. Development continues down branchA, and a new directory, with new files, gets added and committed on branchA. This new directory is obviously not on branchB, since it was created after branchA was created. Question: how does one get the new directory from branchA onto branchB? We have two answers: 1. merge the directory from branchA to branchB. I had a little trouble coming up with the command to do this (I am new to CVS), but that was the obvious answer to me. (in a branchA sandbox, do a cvs update -j branchB filename, or dirname) 2. branch the new files in the new directory using the branchB branch tag. In other words: cvs tag -b branchB newfilename. My thoughts are option #2 will create another branch, with the same name (branchB) in cvs. I believe that option 2 will give my colleague what he wants, but I still believe two separate branches were created and merging would have been the better way to go as it would have brought the files over to the original branchB branch. Any opinions? Thanks so much! ~Christine ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
