[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Bug-gnubg] Committing branch-multi to CVS... help!
From: |
Joern Thyssen |
Subject: |
Re: [Bug-gnubg] Committing branch-multi to CVS... help! |
Date: |
Wed, 4 Jun 2003 18:27:15 +0000 |
User-agent: |
Mutt/1.4.1i |
On Wed, Jun 04, 2003 at 07:33:56PM +0200, Olivier Baur wrote
> 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...?
[snip]
> [s210:~/gnubg/gnubg] olivierb% cvs -z3 -d
> address@hidden:/cvsroot/gnubg commit -r branch-multi
Try without the -r option.
Also, do "cvs update" without the -r option.
Check with "cvs status -v gnubg.c" if you're still on the branch-multi
branch.
You can also set the environment variable CVSROOT to
address@hidden:/cvsroot/gnubg to avoid having to type -d
parameter each time. I've also created a file $HOME/.cvsrc which have lines
with
-z9
diff -c
Jørn