All geek questions in one place

Why is svn status displayed if I have not changed the files?

For some reason SVN status shows:

M .

This means that the current directory has been changed. But why? I created a directory called .git inside the main svn repository.

Then I added git to the ignore list:

 svn propedit svn:ignore .

But he still shows:

  M .
+4
source share
2 answers

If you ignore the folder / file, the parent folder is marked as changed until the next commit, but it does not change the status of its children. I think you should try to commit the parent folder (..). Changes to .git will be committed and then ignored.

By the way, how is this project under two version control systems?

+2
source

It may also be the case when you have combined the trunk or some other and then forgot to commit -

In my case, svn diff showed:

 --- . (revision 2723) +++ . (working copy) Property changes on: . ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk/CrowdRoamingV2:r2667-2722

You can see that th now contains merge information in this thread.

+2
source

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

More articles:


All Articles