Merge report issue in subversion 1.5
From: Chuck Holzwarth <chuck_holzwarth_at_yahoo.com>
Date: Tue, 17 Feb 2009 13:53:31 -0800 (PST)
The company where I am working has implemented subversion 1.5.4. There are a lot of complaints from developers about issues. One of the main issues is about merging. I have been looking over their shoulders when they merge and the issues are more user interface issues than actual functionality issues.
Has anyone considered making the reporting of mergeinfo property changes optional or breaking them out into a separate category? I watched as a developer merged the trunk to his working branch and saw two files change, where the content of the file changed. When the commit was queued, it showed many files. All except two of the files were where the property changed. I tried with both Tortoise and subclipse and was unable to discern the files where the content changed from the files where the property changed.
There are also many times when there are conflicts merging properties. The summary at the end of the merge lists the number of conflicts and this causes a lot of concern. It should be possible to provide statistics broken into file changes and property changes. This will probably alleviate some of the resistance. Also, is it necessary to show the files where the properties have changed as part of the commit? The developers are not interested in this type of information. Would it be possible to add an option to show this information only if it is desired? I can see looking at the changes to mergeinfo when looking at a commit for debugging during subversion development but not for all usage.
I have used subversion for several years now and with 1.5 I am seeing many new errors reported on the client and server.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
This is an archived mail posted to the Subversion Users mailing list.