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

[Laurent Carlier]

Le mercredi 4 octobre 2006 23:57, Charlie Reinl a écrit :
> Am Mittwoch, den 04.10.2006, 23:27 +0200 schrieb Laurent Carlier:
> > Le mercredi 4 octobre 2006 22:51, Charlie Reinl a écrit :
> > > 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
> >
> > If it's only the lines beginning with # i guess you can safely update
> > them.
> >
> > After you must indicate to svn that the conflict is resolved with :
> > svn resolved thefile
> >
> > after you can do an svn ci safely
>
> Salut Laurent,
>
> the problem is not the way how to finish commit.
> The file/files at .lang change with every line you write in a gambas
> project, and they are generated .
> So they have to be set beside on a tool like svn.
> If it is possible, these files have to be on an exclude list.
>
> Amicalment
> Charlie
>

The better way (for me) is to keep a "clean" copy of the trunk where you put 
your modified files, from where you can commit your changes without all 
the .lang files.

Regards,