Hello Richard, > I'm running VisualSVN Server version 2.7.4 with the Visual Studio add-in of > version 4.0.5 > > I have a directory named "Source", where I place my solutions. > VisualSVN creates a second copy in Documents, i.e. > C:\Users\Me\Documents\Visual Studio 2010\Projects\Project1 > > Could someone tell me which one is considered my "Working Copy"? > > Sometimes when I try to update the changes, I receive a notice of a > conflict. However, when I view the diff file I can't tell which one is > which. It just says "Mine" and "Theirs".
What's the purpose to have a separate "Source" directory? It actually looks like some kind of version-control misuse, unless this is a location of your repositories that you access over HTTP(S). There should not be any separate locations for solutions and working copies because a working copy is essentially a solution you work with. The working copy contains the solution that is version-controlled by Subversion. A working copy represents a Visual Studio solution and is placed to C:\Users\Username\Documents\Visual Studio 2010\Projects\ by default. If you want to checkout a working copy, just go to Visual Studio | VisualSVN | Get Solution from Subversion and checkout the URL of the solution you work with. Choose to checkout to a new EMPTY location to ensure that you won't get any conflicts. This way you'll get a working copy that contains your solution / projects. No separate location is required. Make sure to read these SVNBook chapters: * SVNBook | Basic Work Cycle: https://www.visualsvn.com/support/svnbook/tour/cycle/ * SVNBook | The Working Copy: https://www.visualsvn.com/support/svnbook/basic/version-control-basics/#svn.basic.working-copy * SVNBook | Creating a Working Copy: https://www.visualsvn.com/support/svnbook/tour/initial/ > A recent change has the .csproj file in C:\Users\Me\Documents\Visual Studio > 2010\Projects\Project1 shown with a conflict and I need to understand which > is "Mine" and "Theirs". Your working copy state conflicts with the repository state. If you work on the project alone, then normally you should not get any conflicts. If you work on the project alone and get conflicts then I can guess that this is a result of the fact that you specify above (some "Source" folder and actual working copies located in "Projects"). If you work on the project in a team, then there is a conflict you should solve. For the instruction on conflict resolution see SVNBook | Resolve Any Conflicts: https://www.visualsvn.com/support/svnbook/tour/cycle/#svn.tour.cycle.resolve Thank you. -- With best regards, Pavel Lyalyakin VisualSVN Team -- You received this message because you are subscribed to the Google Groups "VisualSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to visualsvn+unsubscr...@googlegroups.com. To post to this group, send email to visualsvn@googlegroups.com. Visit this group at http://groups.google.com/group/visualsvn. For more options, visit https://groups.google.com/d/optout.
