Hello Timothy, Commit operation must be atomic, that means no part of a commit takes effect until the entire commit has succeeded. To resolve this conflict situation when a new file is added on repository and in local working copy another file with same name exist in UNVERSIONED or ADDED state, you can use one of the actions available on contextual menu of the 'Synchronize' view: 'Override and Update', 'Override and Commit' or 'Mark as Merged'. For more details about resolving conflict situations see the 'Resolve Conflicts' section from our website documentation page: http://www.syncrosvnclient.com/doc/ug-svnclient/resolving-conflicts.html. If you can reproduce the problem please send us more details to resolve it. -- Best Regards, Radu --------------------------------------------------------------------- Radu Pisoi Syncro SVN Client - http://www.syncrosvnclient.com <oXygen/> XML Editor, Schema Editor and XSLT Editor/Debugger http://www.oxygenxml.com Timothy Reaves wrote:
I've recently started having problems though. I'll do a commit, and get a network comm error. Once this happens, I'm screwed. I have to do a lot manually to resolve the issue.
So if I'm adding a file, and committing a change, when I commit I get the malformed network data or some-such. When I then do another commit, it fails, saying that the file already exists on the server. It's a real mess.
Does this ring any bells off of the top of anyones head?
On Wed, January 24, 2007 11:31 am, Paul Everitt wrote:
On Jan 24, 2007, at 11:24 AM, George Cristian Bina wrote:
Hello,
Just a quick note to let you know that the SVN client that is integrated in oXygen is available also as a separate product Syncro SVN Client http://www.syncrosvnclient.com The SVN support in oXygen will be improved along with the further development of the Syncro SVN Client.
I just started using the SVN Client recently. I put it off because my existing SVN habits were pretty ingrained. I must say, I find the client really well done and useful. I can see a number of choices made, the little touches, that I greatly appreciate...as an example, the left arrow for update and the right arrow for commit are disabled if there isn't anything remote to update or local to commit.
Obviously the diff-merge is one of the huge benefits of trying a new client for SVN, and it's lived up to its potential in my use so far.
Anyway, thanks for the hard work on this!
--Paul _______________________________________________ oXygen-user mailing list oXygen-user@oxygenxml.com http://www.oxygenxml.com/mailman/listinfo/oxygen-user
_______________________________________________ oXygen-user mailing list oXygen-user@oxygenxml.com http://www.oxygenxml.com/mailman/listinfo/oxygen-user