[platform-cvs-dev] CVS update corrupted my source

["Kristopher Ives" <nullmind@xxxxxxxxx>]

I'm using Eclipse 3.3.1.1
on Ubuntu 7.10 (Gutsy) with the latest updates from the discovery site
as well as my local repositories. When multiple devs do concurrent
edits on a source file, one commits, it will garble our source putting
what appears to be a diff pattern. After trying to update again it will
report:

The server reported an error while performing the "cvs update" command.
reuox: The server did not provide any additional information.

However, this is untrue, as I
can still execute a "cvs update" and my CVS server is actually working
fine, no such error has ever been reported (and "not" at the same
time...), so Eclipse is slandering my CVS server. The source that was
garbled will look like this:

----------------------------
        selector = Selector.open();
        
<<<<<<< LoginServer.java
        InetAddress ip = InetAddress.getByName("

192.168.1.104");
        System.out.println(ip.toString());
=======
        Enumeration<NetworkInterface> ifaces = NetworkInterface.getNetworkInte

rfaces();
----------------------------

In this case I had added much more source than this when I commited (gets an enumation of the network interfaces and prints the InetAddresses associated with them for use in our server)

Cheers,
Kristopher Ives