Gilles Crebassa wrote:
Oui , bien sur mais je veut dire � CVS qu'un fichier que j'ai supprim�(mode attic) redeviennent comme avant mais j'y arrive pas .
Peut-etre l'a tu deja fait ?
Gilles
Voici une copie d'une manip qui montre que ca marche : [EMAIL PROTECTED] democvs]$ export CVSROOT=/tmp/democvs/mabase [EMAIL PROTECTED] democvs]$ cvs init [EMAIL PROTECTED] democvs]$ mkdir tmp ; cd tmp [EMAIL PROTECTED] tmp]$ touch f1 f2 [EMAIL PROTECTED] tmp]$ echo "Fichier 1" > f1 [EMAIL PROTECTED] tmp]$ echo "Fichier 2" > f2 [EMAIL PROTECTED] tmp]$ cd .. [EMAIL PROTECTED] democvs]$ cd tmp [EMAIL PROTECTED] tmp]$ cvs import -m "On commence" file VT MT N file/f1 N file/f2
No conflicts created by this import
[EMAIL PROTECTED] tmp]$ cd .. [EMAIL PROTECTED] democvs]$ rm -rf tmp [EMAIL PROTECTED] democvs]$ cvs co file cvs checkout: Updating file U file/f1 U file/f2 [EMAIL PROTECTED] democvs]$ cd file [EMAIL PROTECTED] file]$ echo "M 2" >> f1 [EMAIL PROTECTED] file]$ echo "M 2" >> f2 [EMAIL PROTECTED] file]$ cvs ci -m "Apres modif 2" cvs commit: Examining . Checking in f1; /tmp/democvs/mabase/file/f1,v <-- f1 new revision: 1.2; previous revision: 1.1 done Checking in f2; /tmp/democvs/mabase/file/f2,v <-- f2 new revision: 1.2; previous revision: 1.1 done [EMAIL PROTECTED] file]$ cvs commit cvs commit: Examining . [EMAIL PROTECTED] file]$ cd .. ; rm -rf file ; cvs co file ; cd file cvs checkout: Updating file U file/f1 U file/f2 [EMAIL PROTECTED] file]$ cat f2 Fichier 2 M 2 [EMAIL PROTECTED] file]$ rm f2 rm: d�truire fichier r�gulier `f2'? y [EMAIL PROTECTED] file]$ cvs remove f2 cvs remove: scheduling `f2' for removal cvs remove: use 'cvs commit' to remove this file permanently [EMAIL PROTECTED] file]$ cvs ci -m "Arret temporaire de f2" cvs commit: Examining . Removing f2; /tmp/democvs/mabase/file/f2,v <-- f2 new revision: delete; previous revision: 1.2 done [EMAIL PROTECTED] file]$ echo "M 3" >> f1 [EMAIL PROTECTED] file]$ cvs ci -m "Modif 3" cvs commit: Examining . Checking in f1; /tmp/democvs/mabase/file/f1,v <-- f1 new revision: 1.3; previous revision: 1.2 done [EMAIL PROTECTED] file]$ cd .. [EMAIL PROTECTED] democvs]$ rm -rf file [EMAIL PROTECTED] democvs]$ cvs co -r 1.2 file cvs checkout: Updating file U file/f1 U file/f2 [EMAIL PROTECTED] democvs]$ cd file [EMAIL PROTECTED] file]$ cat f2 Fichier 2 M 2 [EMAIL PROTECTED] file]$ cp f2 f2.svg [EMAIL PROTECTED] file]$ cvs update -A cvs update: Updating . U f1 cvs update: f2 is no longer in the repository ? f2.svg [EMAIL PROTECTED] file]$ mv f2.svg f2 [EMAIL PROTECTED] file]$ echo "f2 dans la course" >> f2 [EMAIL PROTECTED] file]$ cat f2 Fichier 2 M 2 f2 dans la course [EMAIL PROTECTED] file]$ cvs add f2 cvs add: re-adding file f2 (in place of dead revision 1.3) cvs add: use 'cvs commit' to add this file permanently [EMAIL PROTECTED] file]$ echo "Last modif" >> f1 [EMAIL PROTECTED] file]$ echo "Last modif" >> f2 [EMAIL PROTECTED] file]$ cvs ci -m "Apres remise en route de f2" cvs commit: Examining . Checking in f1; /tmp/democvs/mabase/file/f1,v <-- f1 new revision: 1.4; previous revision: 1.3 done Checking in f2; /tmp/democvs/mabase/file/f2,v <-- f2 new revision: 1.4; previous revision: 1.3 done [EMAIL PROTECTED] file]$ cd .. [EMAIL PROTECTED] democvs]$ rm -rf file ; cvs co file ; cvs checkout: Updating file U file/f1 U file/f2 [EMAIL PROTECTED] democvs]$ cat file/f1 Fichier 1 M 2 M 3 Last modif [EMAIL PROTECTED] democvs]$ cat file/f2 Fichier 2 M 2 f2 dans la course Last modif [EMAIL PROTECTED] democvs]$ exit
Vous souhaitez acquerir votre Pack ou des Services MandrakeSoft? Rendez-vous sur "http://www.mandrakestore.com";.
Foire Aux Questions de la liste : http://mdk.mondelinux.org
