[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: libtool ChangeLog [branch-2-0]
From: |
Peter Ekberg |
Subject: |
RE: libtool ChangeLog [branch-2-0] |
Date: |
Wed, 3 Aug 2005 22:46:59 +0200 |
Ralf Wildenhues wrote:
> * Peter Ekberg wrote on Thu, Jul 28, 2005 at 03:18:18PM CEST:
> >
> > I came across a surprise in the commit script though. When
> > commiting on branch-2-0, the script checked for conflicts
> > against head, which forced me to --force one commit.
> >
> > Is this caused by an error in my routine?
>
> I don't see how this could happen. The script runs `cvs
> update -n' and
> checks for lines beginning with 'C' -- branch crossing should
> not happen
> here.
Someone gave me the advise to use cvs update -PAd so I added
that to my .cvsrc a long time ago without really knowing
what all options did. I have now removed the A, which seems
to fix this problem.
Sorry for the confusion...
Cheers,
Peter