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

[Charlie R. <Kar...@fe...>]

1Am Donnerstag, den 05.10.2006, 18:17 +0200 schrieb Benoit Minisini:
> On Wednesday 04 October 2006 22:51, Charlie Reinl wrote:
> > Salut Beno=C3=AEt,
> >
> > for that we need a solution :
> >
> > gentoo01 gambas2 # svn commit
> >
> > svn: =C3=9Cbertragen fehlgeschlagen (Details folgen):
> > --svn: Transferred missed (details follow)
> >
> > svn: =C3=9Cbertragung
> > 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
> >
>=20
> The .pot file is generated at each compilation by the IDE. But it is no=
t=20
> generated by the gambas compiler, so I remove it from the repository, t=
he=20
> installation scripts won't work anymore.
>=20
> But there is an option to remove from the generated file all file refer=
ences.=20
> So I will try it.
>=20
> Otherwise, you cannot commit, as you are not allowed to do this.
>=20
Salut,


thats wrong I can commit, but not to the repository and that I know.
The conflicts are found before the login.



Amicalment
Charlie