Menu
In my team, some we help each other with the merges. I.e. my code is merged back to trunk by someone else. It seems like the author info not is fully preserved during a merge. When I do annotate (blame) the merger is shown as the author.
Have the merger done something wrong or isn’t the original author preserved in a merge?
469
This basic syntax— svn merge URL —tells Subversion to merge all changes which have not been previously merged from the URL to the current working directory (which is typically the root of your working copy).
A synchronization merge is appropriate when synchronization of a branch with its ancestor is required. For example, feature branches should be periodically synchronized with their ancestor to minimize integration risk. Synchronization should be performed as frequently as possible.
Examples. Merge a branch back into the trunk (assuming that you have an up-to-date working copy of the trunk): $ svn merge --reintegrate \ http://svn.example.com/repos/calc/branches/my-calc-branch --- Merging differences between repository URLs into '. ': U button.
If your server does merge tracking and your client tools are version 1.5 or later, this will work:
svn blame --use-merge-history TARGET
A merge looks like someone checkout out trunk, made a load of changes all at once and then committed back in. Whoever did the final commit after the merge will show as the author. If you are getting people to help with the merge, make sure they do it under the username of the person you wish it to be attributed to.
Having said all that, if someone makes a mistake in the merge then you want the name of the person who 'helped' with the merge if they were the one doing it, surely?
30
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
