|
From: | Mark E. Hamilton |
Subject: | Re: Please HElP. A developer has removed/commit files from Integration Branch!!! |
Date: | Wed, 07 Dec 2005 17:21:31 -0700 |
User-agent: | Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.3) Gecko/20040913 |
Jim Hyslop wrote:
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Mark E. Hamilton wrote:cd subdirectory/with/missing/files cvs add missing_file cvs commit missing_file cvs slap_developers_handSo, I did a little test with both your suggestion (which seems to be the most pouplar one in this thread) and mine. Both seem to do the same thing. What am I missing? Are they just two different ways to do the same thing, or is there a reason to prefer on over the other?If you have the files available to re-add, then yours will work just fine. But you have to have a good file physically present in the directory before you can add and commit it. The merge command doesn't require the file to be present.
Well, it doesn't seem to work that way for me. As long as I know the name it pops the previous version right back out of the repository:
sahp6613% cvs log test1.dat RCS file: /var/scratch/mhamilt/cvsrepos/test/dir1/Attic/test1.dat,v Working file: test1.dat head: 1.2 branch: locks: strict access list: symbolic names: test_tag2: 1.1 test_tag: 1.1 keyword substitution: kv total revisions: 2; selected revisions: 2 description: ---------------------------- revision 1.2 date: 2005/12/08 00:17:58; author: mhamilt; state: dead; lines: +0 -0 Test ---------------------------- revision 1.1 date: 2005/12/02 18:37:09; author: mhamilt; state: Exp; Added more test files ============================================================================= sahp6613% ls CVS/ dir2/ test.dat sahp6613% cvs add test1.dat *cvs add: Resurrecting file `test1.dat' from revision 1.1.* U test1.dat cvs add: Re-adding file `test1.dat' (in place of dead revision 1.2). cvs add: use 'cvs commit' to add this file permanently
Some judgement is required with your last step, though: depending on the circumstances, a more correct command might be: cvs show_developer_TFM
I like that one. You think they'll accept a patch for it? ;) -- ---------------- Mark E. Hamilton Orion International Technologies, Inc. Sandia National Laboratory, NM. 505-844-7666
[Prev in Thread] | Current Thread | [Next in Thread] |