Diff between branch and trunk
Posted: Tue May 07, 2013 10:21 pm
I'm pretty sure svn diff supports this use case, but I can't figure out how to do it in SyncroSVN. Here's the scenario.
Developer is working in a feature branch ^/branches/mybranch which is branched off of the ^/trunk.
Developer periodically svn merges from ^/trunk to make sure reintegration will go smoothly when the time comes. The history of ^/branches/mybranch is therefore a combination of the changes made by the developer as part of his feature and other changes merged in from ^/trunk.
The time comes when developer wants to know exactly what changed over the entire lifetime of ^/branches/mybranch - but only changes actually associated with the feature, IE wants to exclude those changes that were brought in from the trunk during periodic merges - perhaps as part of a code review. The easiest way to get this is to diff the HEAD of ^/branches/mybranch against the HEAD of ^/trunk. This also corresponds to the changes that will be merged to the trunk in the course of a --reintegrate merge.
I'm pretty sure it can be done on the svn command line. Does anyone know if SyncroSVN can do it; and if not can it be added as a new feature at some point down the line? Thanks.
Tony
Developer is working in a feature branch ^/branches/mybranch which is branched off of the ^/trunk.
Developer periodically svn merges from ^/trunk to make sure reintegration will go smoothly when the time comes. The history of ^/branches/mybranch is therefore a combination of the changes made by the developer as part of his feature and other changes merged in from ^/trunk.
The time comes when developer wants to know exactly what changed over the entire lifetime of ^/branches/mybranch - but only changes actually associated with the feature, IE wants to exclude those changes that were brought in from the trunk during periodic merges - perhaps as part of a code review. The easiest way to get this is to diff the HEAD of ^/branches/mybranch against the HEAD of ^/trunk. This also corresponds to the changes that will be merged to the trunk in the course of a --reintegrate merge.
I'm pretty sure it can be done on the svn command line. Does anyone know if SyncroSVN can do it; and if not can it be added as a new feature at some point down the line? Thanks.
Tony