[Gambas-devel] ran in pb with ../app/src/gambas2/.lang/.pot while commiting

Benoit Minisini gambas at ...1...
Thu Oct 5 18:17:38 CEST 2006


On Wednesday 04 October 2006 22:51, Charlie Reinl wrote:
> Salut Benoît,
>
> for that we need a solution :
>
> gentoo01 gambas2 # svn commit
>
> svn: Übertragen fehlgeschlagen (Details folgen):
> --svn: Transferred missed (details follow)
>
> svn: Übertragung
> abgebrochen: '/opt/gambas2/gambas2_Latest/app/src/gambas2/.lang/.pot' beibt
> im Konflikt
> --svn: Transmission
> broken : '/opt/gambas2/gambas2_Latest/app/src/gambas2/.lang/.pot'
>  stays in the conflict
>
> even if nothing changed, you will always have this :
>  # #-#-#-#-#  Project.pot (PACKAGE VERSION)  #-#-#-#-#
> -# /home/benoit/gambas/2.0/trunk/app/src/gambas2/Project.module
> +# /opt/gambas2/gambas2_Latest/app/src/gambas2/Project.module
>
> Amicalment
> Charlie
>

The .pot file is generated at each compilation by the IDE. But it is not 
generated by the gambas compiler, so I remove it from the repository, the 
installation scripts won't work anymore.

But there is an option to remove from the generated file all file references. 
So I will try it.

Otherwise, you cannot commit, as you are not allowed to do this.

-- 
Benoit Minisini





More information about the Devel mailing list