[Top][All Lists]

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

Re: "Move file away, it is in the way" errors

From: Derek Robert Price
Subject: Re: "Move file away, it is in the way" errors
Date: Tue, 14 Oct 2003 12:38:28 -0400
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030624 Netscape/7.1

Hash: SHA1

Paul Edwards wrote:

|"Derek Robert Price" <address@hidden> wrote in message
|>Hrm.  I'm not sure about how this is going to work on case insensitve
|>clients, but in the other cases you complained about Paul, the answer
|Other cases?  As far as I know this is the first time I've
|had a problem on Windows (I only use Windows for
|simple stuff at home, the complex branches are at work).
|And I don't know that this has anything to do with case

I meant the other move-file-away cases.  I believe you complained some
time back that during a merge from a branch to a branch where a file
with the same name had been added to both branches, CVS reported a
conflict to you that could be accidentally lost track of by touching the
file in question because no merge markers were put in the file.

Larry and I were discussing the possibility of using diff's if-then-else
syntax to specifiy a two-way-merge with merge markers on info-cvs
instead of just printing the conflict warning or warning the user to
move the file away in the update merge case.  I don't have time to
implement this just now but I thought you might have enough interest to
generate the patch.

|>might be to use an if-then-else diff.  See Larry's and my discussion on
|>info-cvs.  If you send a patch with test cases and we can solve the
|>case-insensitive issue, I'll likely commit it.
|I don't even have the ability to recompile CVS on Windows.
|GCC doesn't appear to be one of the supported compilers
|on Windows.

I'm not really worried about worried about Windows in particular in this
case, though "fixing" the case above might cause a merge in the case you
mention (where the issue is a name conflict) when it shouldn't.

| Ok. I don't need new binaries for Windows then, 1.11.5 works
|fine for my simple branch-less environment.

John McNamee just contributed a 1.11.9 binary and I posted it online, so
there is one availabel now.

|Maybe this thing with DEVEL-CVS is an old problem I've just
|never noticed before?

Maybe.  I verified your report but I did not look into the problem very

|BTW, this info-cvs you are talking about, is it mirrored into a
|newsgroup?  It is a pity the CVS documentation doesn't mention
|the newsgroup names, as I prefer newsgroups to mailing lists.

I have no idea.  I only use the email lists and archives.  If there is a
mirror, the name might be similar to the one you are getting bug-cvs
stuff on, but s/bug/info/, since the corresponding mailing lists are
<address@hidden> and <address@hidden>.


- --
~                *8^)

Email: address@hidden

Get CVS support at <http://ximbiot.com>!
- --
A handy telephone tip: Keep a small chalkboard near the phone.  That
way, when a salesman calls, you can hold the receiver up to it and run
your fingernails across it until he hangs up.
Version: GnuPG v1.0.7 (GNU/Linux)
Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org


reply via email to

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