SVN tortoise tree conflicts with itself

Someone had the experience of moving a file in a turtle and successfully committing it, only to make another change later and report a tree conflict, where:

  • the file in the original location was deleted, but in the turtle is marked as missing
  • the file is in its new location, but marked as already added.

(I use the SVN turtle, and we have a client and server> 1.60)

No one changed the directory or the file (according to svn log).

  • Why is this happening?
  • Is there any way to avoid this?
  • If this happens, is there a more elegant way to solve the problem than deleting the entire folder and updating again?
+3
source share
3 answers
  • , "" Windows, "" . , subversion ( ).

  • "" TortoiseSVN , Windows, Tortoise Tortoise.

  • , " ", , .

+3

, , , /. .

+1

, , "" "newpath\to\folder" . :

  • svn "newpath\to\folder"
  • 'oldpath\folder' r-click drag and svn
  • -
  • "oldpath\folder" , "newpath\to\folder"
  • , .

The whole story chain is broken for manually updated files, but at least I can continue working.

0
source

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


All Articles