bug-apl
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Bug-apl] svn update conflicts on *.gmo files


From: Juergen Sauermann
Subject: Re: [Bug-apl] svn update conflicts on *.gmo files
Date: Sun, 09 Mar 2014 11:58:57 +0100
User-agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130330 Thunderbird/17.0.5

Hi David,

you could try:

    svn update --accept theirs-full

Unfortunately the gmo files are put into the repository even though they are generated. The Makefile doing this was installed by the NLS package and I don't know how to change it.

Simply removing the .gmo files from the repo could also break builds on systems where NLS-related scripts are missing, so I would prefer to not play around with the NLS stuff.

/// J├╝rgen


On 03/09/2014 06:13 AM, David B. Lamkins wrote:
I've noticed that often (not always) when I update my working directory
from the repo, I get conflicts on some *.gmo files.

I've been resolving the conflicts as shown in the transcript. Should I
be doing something different? Is there something that can make these
conflicts stop happening?

$ svn update
Updating '.':
U    src/buildtag.hh
U    src/Command.cc
U    src/UserFunction.hh
U    src/Output.hh
U    src/Id.def
U    src/main.cc
U    src/PrimitiveFunction.hh
U    src/SystemVariable.def
U    src/Tokenizer.cc
U    src/UserFunction.cc
U    src/Avec.def
U    src/Token.def
U    src/Output.cc
U    src/PrimitiveFunction.cc
U    README-4-compliance
G    po/address@hidden
G    po/address@hidden
C    po/address@hidden
C    po/address@hidden
G    po/de.po
C    po/de.gmo
G    po/apl.pot
U    gnu-apl.d/preferences
U    ChangeLog
Updated to revision 158.
Conflict discovered in file 'po/de.gmo'.
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
         (mc) my side of conflict, (tc) their side of conflict,
         (s) show all options: tc
tc
Resolved conflicted state of 'po/de.gmo'
Conflict discovered in file 'po/address@hidden'.
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
         (mc) my side of conflict, (tc) their side of conflict,
         (s) show all options: tc
tc
Resolved conflicted state of 'po/address@hidden'
Conflict discovered in file 'po/address@hidden'.
Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
         (mc) my side of conflict, (tc) their side of conflict,
         (s) show all options: tc
tc
Resolved conflicted state of 'po/address@hidden'
Summary of conflicts:
   Text conflicts: 0 remaining (and 3 already resolved)








reply via email to

[Prev in Thread] Current Thread [Next in Thread]