[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

CVS tag help needed



I accidentally did a "make tag" with some locally modified files:

$ make tag
cvs tag -c python-matplotlib-0_83_1-1_fc5
For more information on using the Fedora CVS repositories, please visit http://fedoraproject.org/wiki/UsingCvs
? build.log
? i386
? matplotlib-0.82.tar.gz
? matplotlib-0.83.1
? python-matplotlib-0.83.1-1.src.rpm
cvs tag: .cvsignore is locally modified
cvs tag: sources is locally modified
cvs [tag aborted]: correct the above errors first!
make: *** [tag] Error 1


I've checked in .cvsignore and sources now, but they are not tagged with python-matplotlib-0_83_1-1_fc5, and make tag now fails:

$ make tag
cvs tag -c python-matplotlib-0_83_1-1_fc5
For more information on using the Fedora CVS repositories, please visit http://fedoraproject.org/wiki/UsingCvs
? build.log
ERROR: Tag python-matplotlib-0_83_1-1_fc5 has been already created.
The following tags have been created so far
python-matplotlib-0_82-2:devel:orion:1120167615
python-matplotlib-0_82-3_fc5:devel:orion:1120235006
python-matplotlib-0_82-4_fc5:devel:orion:1122582000
python-matplotlib-0_83_1-1_fc5:devel:orion:1122583172
cvs tag: Pre-tag check failed
cvs [tag aborted]: correct the above errors first!
make: *** [tag] Error 1


What's the best way out?

--
Orion Poplawski
System Administrator                   303-415-9701 x222
Colorado Research Associates/NWRA      FAX: 303-415-9702
3380 Mitchell Lane, Boulder CO 80301   http://www.co-ra.com


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]