On Wed, 1 May 2007, Jason L Tibbitts III wrote:
"VG" == Viktor Griph <[EMAIL PROTECTED]> writes:
VG> It seems as if the build directory has files locally modified,
VG> which has resulted in a cvs-conflict.
It's never had anything other than plain CVS checkouts in it. The
snapshot process just runs cvs update -dPA and builds.
But the error message starts with
P ChangeLog
P NEWS
M doc/modules/modules.html
P fvwm/add_window.c
P po/ChangeLog
P po/Makefile.am
M po/fvwm.de.gmo
M po/fvwm.fr.gmo
RCS file: /home/cvs/fvwm/fvwm/po/fvwm.sv_SE.po,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into fvwm.sv_SE.po
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in po/fvwm.sv_SE.po
C po/fvwm.sv_SE.po
M po/fvwm.zh_CN.po
which is output from cvs update, clearly showing that several files in
po are locally modified, as well as doc/modules/modules.html
The po and gmo files are modified by make dist, and should probably have
been cheked in with the other localization changes. I'll check in the
files as changed by make distdir in po. The snapshot working directory
probably needs a -C update to go back to normal operation.
/Viktor
