[Bug-gnubg] Committing branch-multi to CVS... help!

[Olivier Baur]

I'm trying to commit my changes into the branch "branch-multi", but 
something looks strange: the default message that cvs offers to log 
states that almost all files have been modified since my last commit, 
when I have touched only a few... What's more, the new gtktempmap.c 
file shows up in the branch; I thought we would have to merge later...?

Or maybe everything's okay?

Jørn?


-- Olivier


(cvs session transcript follows:)

[s210:~/gnubg/gnubg] olivierb% cvs -z3 -d 
address@hidden:/cvsroot/gnubg update -r branch-multi
Enter passphrase for RSA key '/Users/olivierb/.ssh/identity':
/* I have removed lines starting with ? */
cvs server: Updating .
P ChangeLog
P Makefile.am
P Makefile.in
RCS file: /cvsroot/gnubg/gnubg/configure,v
retrieving revision 1.97.2.2
retrieving revision 1.97.2.3
Merging differences between 1.97.2.2 and 1.97.2.3 into configure
M configure
P configure.in
RCS file: /cvsroot/gnubg/gnubg/eval.c,v
retrieving revision 1.231.2.2
retrieving revision 1.231.2.3
Merging differences between 1.231.2.2 and 1.231.2.3 into eval.c
M eval.c
M gnubg.c
M gtkgame.c
RCS file: /cvsroot/gnubg/gnubg/Attic/procunits.c,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.7
Merging differences between 1.2.2.4 and 1.2.2.7 into procunits.c
M procunits.c
U procunits.h
M rollout.c
U threadglobals.c
U threadglobals.h
cvs server: Updating boards
cvs server: Updating doc
cvs server: Updating ext
cvs server: Updating html-images
cvs server: Updating intl
cvs server: Updating lib
M lib/cache.h
M lib/hash.c
M lib/neuralnet.c
cvs server: Updating m4
cvs server: Updating met
cvs server: Updating po
cvs server: Updating sounds
cvs server: Updating xpm

[s210:~/gnubg/gnubg] olivierb% cvs -z3 -d 
address@hidden:/cvsroot/gnubg commit -r branch-multi
cvs commit: Examining .
cvs commit: Examining boards
cvs commit: Examining doc
cvs commit: Examining ext
cvs commit: Examining html-images
cvs commit: Examining intl
cvs commit: Examining lib
cvs commit: Examining m4
cvs commit: Examining met
cvs commit: Examining po
cvs commit: Examining sounds
cvs commit: Examining xpm
Enter passphrase for RSA key '/Users/olivierb/.ssh/identity':
CVS: 
----------------------------------------------------------------------
CVS: Enter Log.  Lines beginning with `CVS:' are removed automatically
CVS:
CVS: Committing in .
CVS:
CVS: Modified Files:
CVS:  Tag: branch-multi
CVS:    .cvsignore ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL
CVS:    Makefile.am Makefile.in NEWS README TODO acinclude.m4
CVS:    aclocal.m4 analysis.c analysis.h autogen.sh backgammon.h
CVS:    bearoff.c bearoff.h bearoffgammon.c bearoffgammon.h boardpos.c
CVS:    boardpos.h boards.xml config.guess config.h.in config.rpath
CVS:    config.sub configure configure.in copying.awk copying.c
CVS:    credits.c credits.sh database.c database.h depcomp dice.c
CVS:    dice.h drawboard.c drawboard.h erf.c erftest.c eval.c eval.h
CVS:    export.c export.h external.c external.h getopt.c getopt.h
CVS:    getopt1.c gnu.xpm gnubg.6 gnubg.c gnubg.gtkrc gnubg.scm
CVS:    gnubgtest gtk-multiview.c gtk-multiview.h gtkboard.c
CVS:    gtkboard.h gtkchequer.c gtkchequer.h gtkcolour.c gtkcolour.h
CVS:    gtkcube.c gtkcube.h gtkexport.c gtkexport.h gtkgame.c
CVS:    gtkgame.h gtkmet.c gtkmet.h gtkmovefilter.c gtkmovefilter.h
CVS:    gtkprefs.c gtkprefs.h gtkrace.c gtkrace.h gtkrolls.c
CVS:    gtkrolls.h gtksplash.c gtksplash.h gtktempmap.c gtktempmap.h
CVS:    gtktexi.c gtktexi.h gtktheory.c gtktheory.h guile.c guile.h
CVS:    html.c htmlimages.c i18n.c i18n.h import.c import.h install-sh
CVS:    kleinman.c latex.c luxi.c makebearoff.c makebearoff1.c
CVS:    makehyper.c makeweights.c matchequity.c matchequity.h
CVS:    matchid.c matchid.h missing mkinstalldirs nextgame.xpm
CVS:    nextmarked.xpm nextmove.xpm onechequer.c onechequer.h
CVS:    openurl.c openurl.h osr.c osr.h path.c path.h play.c
CVS:    positionid.c positionid.h postscript.c prevgame.xpm
CVS:    prevmarked.xpm prevmove.xpm procunits.c procunits.h pub_eval.c
CVS:    question.xpm record.c record.h render.c render.h renderprefs.c
CVS:    renderprefs.h rollout.c rollout.h set.c sgf.c sgf.h sgf.l
CVS:    sgf.y sgfl.c sgfp.c sgfp.h show.c sound.c sound.h speed.c
CVS:    stamp-h.in strdup.c text.c threadglobals.c threadglobals.h
CVS:    userrng.c xboard.c xboard.h xgame.c xgame.h doc/.cvsignore
CVS:    doc/ChangeLog doc/Makefile.am doc/Makefile.in doc/README
CVS:    doc/annealing.gp doc/annealing.txt doc/bar.png
:q
Log message unchanged or not specified
a)bort, c)ontinue, e)dit, !)reuse this message unchanged for remaining 
dirs
Action: (continue) a
cvs [commit aborted]: aborted by user