Geek asks and answers

Merging and committing svn keeps showing me files unchanged, but with mergeinfo changing

I do a lot of mergers and compromises. what always happens to me (in every commit) is a constant set of files like a.java b.java foldera folderb etc. and other files that the svn commit dialog always shows me, I have to commit them, however themselvs files have not changed, the fact that its display has changed is information about their merging, but in fact I don’t understand why it shows them to me commit dialog, because no matter how many merges I do in the commit dialog, these files are always displayed for me, even if I change only one file in the source branch, I make a commit, I see this set of files if I change another file in the source branches and merge with the new branch And then I fixed again and again see this collection of files (for example, 15 files ...) in any case knowHow can I overcome this, please?

thank

+3
source share
2 answers

This is usually due to the way SVN manages mergers. It adds a property to the file, which says from which branches / revisions the file was merged.

Since my experience (or lack) of svn is not very good at tracking mergers, I use the flag --ignore-ancestrywhen merging. This usually fixes these problems and does not update the mergeinfo property.

Check on the right, there are a few more questions related to the same question.

And if you want to try something new, move your repository to Mercury or git to avoid any nonsense of merging :).

+2
source

, svn: merge-info . , - . , , .

, , svn: merge-info , .

svn: merge-info .

+4

More articles:


All Articles