All geek questions in one place

Problem with SVN and file name 'changes'

I program in Visual Studio 2010 using TortiseSVN and VisualSVN as my client to connect to SVN repositories.

I have a slightly common problem, although the whole thing is SVN in general. One thing that continues to occur is that if I make changes to files, namely file names, or move them to new folders, etc., I get all kinds of conflicts with the repository, and that just causes all kinds of strange errors .

I understand the importance of version control and registration / registration access like this, but what do most of you do to deal with such things? I mean, I tried to do everything “Delete from Subversion”, modify my file and then “Add to Subversion”, and it just doesn't work very well. This is especially unpleasant when working on web projects, where file names can change very often, as the project develops and becomes multifaceted.

Are there any standard ways to deal with such things, or is this just one of the drawbacks of SVN in general?

+4
source share
3 answers

First, I must admit that in recent years I have entered every SVN trap. But in 99% it was my mistake.

Common errors:

  • Rename the file and replace the lowercase.txt file with UPPERCASE.txt (for Windows only, to avoid this, first change the name to UPPERCASE1.txt and then rename to UPPERCASE.txt)
  • Using Explorer for rename / delete / move operations (better use Build-In striping methods
  • Cross-related Conflicts

and one more thing that I cannot remember at the moment.

I haven't used visualsvn yet, but I think it's built on top of Tortoise. If you are using Visual Studio, I would recommend ankhsvn http://ankhsvn.open.collab.net/ , which has great integration into the visual studio and catches most of the mistakes you can make (all from within the IDE).

+4
source

One more tip: don't try to move / delete / rename the whole bunch of files and directories in one commit. There are at least a few errors on the subversion server and client v1.6 (where both the extension and the turtle depend) that screw at least your working copy. An approach with multiple commits will work (first rename, commit, then move one folder, copy, etc.).

+1
source

The Subversion process file name changes as deletion and addition, which can be somewhat problematic. This is simply an inherent limitation of Subversion and is part of why some of us have switched to using different version control systems.

0
source

Source: https://habr.com/ru/post/1335869/

More articles:


All Articles