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

[Johannes Kilian]

> 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 ...

Thanks anyway 

Johannes 



-- 
COMPUTERBILD 15/03: Premium-e-mail-Dienste im Test
--------------------------------------------------
1. GMX TopMail - Platz 1 und Testsieger!
2. GMX ProMail - Platz 2 und Preis-Qualitätssieger!
3. Arcor - 4. web.de - 5. T-Online - 6. freenet.de - 7. daybyday - 8. e-Post