[Advacs-discuss] Ooops on CVS

[Oliver Elphick]

On Mon, 2004-08-23 at 11:46, Helmut Wollmersdorfer wrote:
> I tried to add docs/de to CVS and this updated docs/en.
> 
> I do not understand, why this happened, and I am very sorry about this.
> 
> Here is, what I did:
> 
> helmut@xp2400:~/advacs/docs$ cvs -z3 
> -d:ext:wollmers-guest@cvs.alioth.debian.org:/cvsroot/advacs add de -m 
> 'add de-translation of docs'
> Enter passphrase for key '/home/helmut/.ssh/id_rsa':
> cvs [add aborted]: there is a version in de already

This appears to be the problem, but I don't know what it means.

> helmut@xp2400:~/advacs/docs$ cvs -z3 
> -d:ext:wollmers-guest@cvs.alioth.debian.org:/cvsroot/advacs commit de
...
> Checking in de/LICENCE.txt;
> /cvsroot/advacs/docs/en/LICENCE.txt,v  <--  LICENCE.txt
>                       ^^
> 
> new revision: 1.2; previous revision: 1.1
> done
> Checking in de/description.txt;
> /cvsroot/advacs/docs/en/description.txt,v  <--  description.txt
> new revision: 1.5; previous revision: 1.4
> done
> [...]
> helmut@xp2400:~/advacs/docs$ ls -all
> total 36
> drwxr-xr-x   5 helmut helmut  4096 Aug 19 13:24 .
> drwxr-xr-x   5 helmut helmut  4096 Aug 16 14:34 ..
> drwxr-xr-x   2 helmut helmut  4096 Aug 19 13:03 CVS
> -rw-r--r--   1 helmut helmut 15873 Aug 17 10:31 LICENCE.txt
> drwxr-xr-x  16 helmut helmut  4096 Aug 20 16:36 de
> drwxr-xr-x  16 helmut helmut  4096 Aug 23 12:07 en

But on the CVS-Web interface there is only en.  I wonder if you copied
the en directory including its CVS directory, which would contain
references to .../en rather than .../de?

> What did I wrong? It was the normal way I used CVS in the past, and I 
> cannot find what I did wrong compared against CVS documentation.
> What now?

I will have to get in and tidy up the cvs database.  I wonder if we
shouldn't be using subversion, any way!

At the moment, I can't log in, because the web-server will take my
password but ssh won't.  wiggy's looking into it.

-- 
Oliver Elphick                                          olly@lfix.co.uk
Isle of Wight                              http://www.lfix.co.uk/oliver
GPG: 1024D/A54310EA  92C8 39E7 280E 3631 3F0E  1EC0 5664 7A2F A543 10EA
                 ========================================
     "For God hath not appointed us to wrath, but to obtain 
      salvation by our Lord Jesus Christ, Who died for us, 
      that, whether we wake or sleep, we should live  
      together with him."     
                         I Thessalonians 5:9,10