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

[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

++