[cvsnt] Re: Merge-Problem: nonmergeable file needs merge

[Tony Hoyle]

On Fri, 12 Sep 2003 12:02:03 +0200 (MEST), Johannes Kilian
<Jo.Kilian at gmx.de> wrote:

>> The code in cvsnt is quite different.  On NT the error you mention
>> can't happen (it's actually commented out).. on linux it'll happen
>> when you change the executable bit on a file between branches (we
>> don't version any other kind of permission)..  it's arguable what to
>> do in that situation but the existing CVS code treated  it as a
>> nonmergable conflict so I left it that way.
>> 
>
>Hmmmm... thats strange since I'm on a NT-System, using CVSNT ...
>
It's possible if you're using a really old vesrsion...  what's the
output of 'cvs version'?

Tony