Automatic tree conflicts resolution during svn update
From: Danil Shopyrin <danil_at_visualsvn.com>
Date: Mon, 10 Jun 2013 19:21:19 +0400
The current draft of the Subversion 1.8 Release Notes announces
The current draft of the Subversion 1.8 Release Notes says the following:
But I'm unable to make it work. Experimenting with SVN 1.8 RC2 I'm
2. Rename the 'Program.cs' to the 'SuperProgram.cs' file in the first
3. Modify and commit the 'Program.cs' file in the second working copy.
4. Update the first working copy using the 'svn update'.
5. Get the following conflict resolution message:
I do not consider this behavior as *automatic* because of the following:
So my questions are the following:
1) Is there a simple way to enable automatic conflict resolution
2) Should we drop (or reword) this feature from the Release Notes?
Thanks!
P. S. My own opinion is that automatic conflict resolution for moved
-- With best regards, Danil Shopyrin VisualSVN TeamReceived on 2013-06-10 17:22:26 CEST |
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.