Hi. This is my first attempt at making a bug report to this group. Hopefully I'll get it right.
SVN server version: 1.6.5. Build: Tigris.org, Apache 2.2 compatible, maintained by D.J. Heap, Branko Čibej and Troy Simpson) SVN client version: 1.6.9. Build: Collabnet, Windows version. Client OS: Windows XP SP3, 32-bit Server OS: Windows 2003 SP2, 32-bit Apache version: 2.2.13 Ever since our company upgraded to Subversion 1.6 we have occassionally experience a problem with merging where files that should not have been touched by the merge end up showing up in the diffs afterward with the merged revision number stamped in their properties. In all cases the files in question have not actually been modifed by the merge, just had their mergeinfo property updated with the revision number used in the merge. It seems to happen only in some branches. Where it does happen the same files keep getting touched by any other revisions we merge to the branch even when those files are not related to the revision being merged. Sorry, I don't have a reproducable but here is a log of an example: I am merging revision 38300 from trunk [_Core3-trunk\Modules\Core] to branch [ Core3-3.15.x\Modules\Core]. C:\Dev\ModuleTests\Core3-3.15.x\Modules\Core>svn --version --quiet 1.6.9 C:\Dev\ModuleTests\Core3-3.15.x\Modules\Core>svn diff (no differences currently in branch) C:\Dev\ModuleTests\Core3-3.15.x\Modules\Core>svn log -v -c 38300 ..\..\..\_Core3-trunk\Modules\Core ------------------------------------------------------------------------ r38300 | brad.heide | 2010-02-19 18:04:17 -0500 (Fri, 19 Feb 2010) | 1 line Changed paths: M /modules/Core3/trunk/Lib/CoreLib/TCF_Json.cpp DEVCORE3-929 Debug Assertion Error in JSON Value::asCString (When converting to a Rowset attribute string) ------------------------------------------------------------------------ (Only one file, TCF_Json.cpp, is part of revision 38300. Next we do the actual merge...) C:\Dev\ModuleTests\Core3-3.15.x\Modules\Core>svn merge -c 38300 ..\..\..\_Core3-trunk\Modules\Core (It just so happens that revision 38300 has already been merged to this branch so we expect the result of this merge operation to be no changes in the working copy, but lets check for diffs anyhow...) C:\Dev\ModuleTests\Core3-3.15.x\Modules\Core>svn diff Property changes on: . ___________________________________________________________________ Modified: svn:mergeinfo Merged /modules/Core3/trunk:r38300 Property changes on: Test\WebTester ___________________________________________________________________ Modified: svn:mergeinfo Merged /modules/Core3/trunk/Test/WebTester:r38300 Property changes on: Exe\CliShell ___________________________________________________________________ Modified: svn:mergeinfo Merged /modules/Core3/trunk/Exe/CliShell:r38300 Property changes on: Exe\CliShell\CliShell.cpp ___________________________________________________________________ Modified: svn:mergeinfo Merged /modules/Core3/trunk/Exe/CliShell/CliShell.cpp:r38300 Property changes on: Exe\ProfileEditor ___________________________________________________________________ Modified: svn:mergeinfo Merged /modules/Core3/trunk/Exe/ProfileEditor:r38300 Property changes on: Include ___________________________________________________________________ Modified: svn:mergeinfo Merged /modules/Core3/trunk/Include:r38300 Property changes on: Include\TCG_Sdd.h ___________________________________________________________________ Modified: svn:mergeinfo Merged /modules/Core3/trunk/Include/TCG_Sdd.h:r38300 Property changes on: UserAgent\W3C\Behavior\Editors ___________________________________________________________________ Modified: svn:mergeinfo Merged /modules/Core3/trunk/UserAgent/W3C/Behavior/Editors:r38300 Property changes on: Lib\CoreLib\CoreLib4.dsp ___________________________________________________________________ Modified: svn:mergeinfo Merged /modules/Core3/trunk/Lib/CoreLib/CoreLib4.dsp:r38300 Property changes on: Lib\CoreLibHelp\CoreLibHelp4.dsp ___________________________________________________________________ Modified: svn:mergeinfo Merged /modules/Core3/trunk/Lib/CoreLibHelp/CoreLibHelp4.dsp:r38300 Property changes on: Lib\UTestLib ___________________________________________________________________ Modified: svn:mergeinfo Merged /modules/Core3/trunk/Lib/UTestLib:r38300 Property changes on: Cli ___________________________________________________________________ Modified: svn:mergeinfo Merged /modules/Core3/trunk/Cli:r38300 Property changes on: Cli\TpxTest ___________________________________________________________________ Modified: svn:mergeinfo Merged /modules/Core3/trunk/Cli/TpxTest:r38300 Property changes on: Srv\CoreSrvApp ___________________________________________________________________ Modified: svn:mergeinfo Merged /modules/Core3/trunk/Srv/CoreSrvApp:r38300 C:\Dev\ModuleTests\Core3-3.15.x\Modules\Core> A whole bunch of files have had their mergeinfo property stamped with revsion 38300 even though they had nothing to do with revision 38300. Brad Heide Senior Systems Architect Trapeze brad.he...@trapezegroup.com www.trapezegroup.com
