[Top][All Lists]

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

Re: a couple of cvs problems....

From: Pierre Asselin
Subject: Re: a couple of cvs problems....
Date: Sun, 26 Mar 2006 23:19:36 +0000 (UTC)
User-agent: tin/1.6.2-20030910 ("Pabbay") (UNIX) (NetBSD/2.0.3 (i386))

Martin J?rgensen <address@hidden> wrote:
> >>cvs update: move away ./.cvsignore; it is in the way
> But why doesn't it write:
> C .cvsignore
> Like it used to do, when updating to tell that there's a conflict here???

Who knows, but it's a different kind of conflict.  The usual
conflicts are overlapping changes by two people, but this one is
a collision between a non-cvs file in your sandbox and a file added
under the same name by someone else.  The two kinds are detected
at different places in the CVS code and the two messagea are
different.  They probably *should* be different, since the corrective
actions are different:  edit conflict markers in one case, rename
a file in the other case.

pa at panix dot com

reply via email to

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