All geek questions in one place

How to prevent Subversion from merging binary files?

We have a need to store DLLs in our repository. Our team often encounters SVN conflicts in DLL files, and this is very annoying. For some reason, even though the mime.dlls type is set to application / octet-stream, svn is still trying to combine them.

From what I found here (which I swear, as it was before), he says that as long as the mime type isn't text, svn will not try to combine them. But, looking at my DLLs, I am informed that svn also merges my application / octet-stream files (at least I assume that SVN is merged, not sure why there will be a conflict without merging). Why does heck try to merge the binary? This is just stupid ...

Anyone facing this problem?

My goal is to find a solution that allows binary files to be part of the repository, but never conflicts. I want SVN to simply replace with the latest binary and call it good.

Please do not discuss why I should or should not put binaries in the repository - I need and don't want conflict problems.

Like FYI: I use Tortoise 1.5.0 and Ankh.

+3
source share
5 answers

To make sure I understand you correctly, repeat the following:

  • You have svn checked binaries
  • these files can be modified both in the client and in the repository
  • when both are changed, the changes from the repository must “win”

AFAIK, the way svn does this would be:

  • 'svn update --accept theirs-full'
  • 'svn update'

, , , , .

+3

, , , . , , . , svn , . , , - , . .

( ), , .

+1

.

CVS , , , Subversion.

, , , , .

.CVSwrappers *.fileext -k b -m COPY. CVS . .

SVN . - , , .

+1

, ? , , subversion , ( , ).

What exactly do you want if you have a locally modified dll and someone commits the same dll before you do this? What do you expect? Obviously, the conflict and subversion do not know if you want to use your dll or their dll.

0
source

These dll files, do they build output from real projects?

If so, they should not be entered in svn. Subversion must contain the source files, and the / dev build server can build the dll there.

-1
source

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

More articles:


All Articles