How can I tell CVS to take a directory as the latest Version of abranch?
Hi, I have allready asked this question on this list about a month ago, (How to add files to a branch), but nobody answered. since this is realy important and I couldn't find the information anywhere, I ask again. I have a version of my project, which changed very much since the last checkout. there were files added, removed and moved, so a normal commit won't work as I expect it to, especially since CVS wont let me add any files to the branch. What I like to know is this, how can I get my current working directory into CVS, as it is? Do I have to do it via a import? TIA Fabio ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Re: Merging on Vendor releases
On Monday 02 December 2002 18:43, Nick Patavalis wrote: First create a branch rooted at basicChanges, like this: cvs rtag -b -r basicChanges b_basicChanges Then checkout from this branch: cvs co -r b_basicChanges Then merge the vendor changes in it: cvs update -j VendorRelease -j VendorRelease_new Just to get it right: For this I have to have the New Vendor Release imported, right? what I did before the cvs update command is: cvs import -m Import of Kaffe-1.0.7 kaffe-1.0.6 kaffe-org venrel-1-0-7 in a directory with the actual release of the vendor sources. Is this the right thing to do, or do I have to include the new release in a different branch (how?)? The command I issued gave me the usual conflicts, which I ignored, and than issued your update command, which resulted in no conflicts at all. (Which I find quite unbelivable) I am sorry to bother you with these details, but I like to get this right from the beginning, and I am quite confused about what changes happen, at which location when using the different commands. Fix the conflicts, test and make sure everything works fine. Then commit in the branch: Is there a tool (a set of tools) which could assist me in the task? I have played around with tools like cervisia, linCVS and emacs ediff, and gideon. Does anybody know if they are suitable for such a task? And another small question: Is there an easy way of getting a list of the different tags and branches which are in the repository? Again TIA Fabio ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
Merging on Vendor releases
Hi, I am fairly new to CVS, and need to do a not so trivial task with it. I've read all the Documentation I found (Namley the cederquist Online Manual, the FAQ, and a fair amount of the Mailinglist Archive), and tested some things, but am still a bit lost. Here is what I want to do: I have a CVS repository, with a initial vendor release import. From this base there were quite some local modifications to the code, which I like to port to the new release of the vendor, one at a time (We have several tags in our local repository). Using CVS's import feature leaves me with a huge amount of conflicting merges (the vendor project is quite large) and as far as I understand would commit all our modifications at once.(Which would make the resulting code quite undebuggable) What I like to do is porting one local change at a time e.g. I have the following tags VendorRelease basicChanges extension1 extension2 product I'd like to take the new Vendor version and first apply the basicChanges, then test and debug the whole mess, and then go on with extension1 and so on. Now my question is this possible in cvs (I guess so)? If so how do I do it (From what I figured the solution lies somwhere in branching and diffing)? Are there any tools which could assist me? TIA Fabio Fracassi ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
