SVN - Does the author merge so that the guilt is correct?

On my team, some of us help each other with mergers. That is, my code merges again with the trunk to another. It seems that the author’s information is not fully preserved during the merger. When I make an annotation (blame), the merge is displayed as the author.

Merging with something wrong or not the original author saved in the merge?

+5
source share
6 answers

If your server performs tracking merging and your client tools are version 1.5 or later, this will work:

svn blame --use-merge-history TARGET
+10
source

, - , , . , . , , , , .

, - , , , "" , , , ?

+1

SVN . , /.

, . , SVN.

+1

-, , orignal, ... .

Subverison . , . -, SVN , , , "" ... .

+1

100%, , : ... AFAIK , . , , , . , .

0

svn:mergeinfo. .

But this is just a gang - if you want the real author to track mergers, you may need to switch to a tool designed for distributed development: something like git, hgor even darcs.

0
source

All Articles