Re: [Gramps-devel] Strange *.po files.

[Douglas S. B. <db...@cs...>]

On Mon, December 31, 2007 1:01 pm, Peter Landgren wrote:
> Hi all,
>
> Just a moment ago I did:
> [peter@DELL2 trunk]$ svn up
> U    ChangeLog
> U    src/gen/lib/date.py
> U    src/plugins/DefaultGadgets.py
> U    po/ChangeLog
> C    po/de.po
> Uppdaterade till revision 9659

The C means that you and someone else have changed the same bit of code,
and it caused a Conflict.

> If I look at /po I have four (4) files beginning with nde:
> de.po
> de.po.mine
> de.po.r9656
> de.po.r9659

The .mine is your version without the other's changes, and the .r files
are other versions of the file.

> When I run make it produces tons of errrors.

Yes, because when you have a conflict, it is marked with =====, <<<<<, and
>>>> to indicate the conflict.

> If I delete all four and do svn up again, I just get de.po and all is back
> to
> normal.
>
> Anyone knows what's going on?

I think that the only way to get rid of the conflict is to apply your
changes to a freshly updated version.

The best way to avoid this is to do a svn up before editing, and right
before you try to commit.

-Doug

> This has happened most of the times when there is e new *.po file.
> /Peter