[bug?] strange svn:merginfo recording.

hi,

there's one thing in mergeinfo that i don't understand.
let's see an example:

i did a commit on trunk which modified two files:

[dvm.2008.07-dn8k/sources]$ svn log -v -c11239
svn+ssh://pawels@dragon/home/svn/repo/dvm/trunk/sources
------------------------------------------------------------------------
r11239 | pawels | 2008-12-03 13:32:44 +0100 (Wed, 03 Dec 2008) | 1 line
Changed paths:
   M /trunk/sources/Kahuna/makefile-pre
   M /trunk/sources/ScemiPortAdder/makefile-pre

- unhide clean stage.
------------------------------------------------------------------------

now i want to backport changes to branch:

[pawels_at_alison /home/pawels/dvm.2008.07-dn8k/sources]$ svn merge -c11239
svn+ssh://pawels@dragon/home/svn/repo/dvm/trunk/sources .
--- Merging r11239 into '.':
U Kahuna/makefile-pre
U ScemiPortAdder/makefile-pre

looks good, so check the status for sure:

[pawels_at_alison /home/pawels/dvm.2008.07-dn8k/sources]$ svn st
 M .
(...)
M Kahuna/makefile-pre
(...)
 M ScemiPortAdder/spaComp.cpp
 M ScemiPortAdder/h/spaCompDef.hpp
 M ScemiPortAdder/h/spaCompExportMacroDef.hpp
 M ScemiPortAdder/spaComp.hpp
 M ScemiPortAdder/spaCompICreators.cpp
M ScemiPortAdder/makefile-pre
 M ScemiPortAdder/spaCompCreator.cpp
 M ScemiPortAdder/spaCompInfo.hpp
 M ScemiPortAdder/spaCompICreators.hpp
(...)
 M Project

the merge also modified non-related dirs like
e.g. 'Project' and update theirs mergeinfo.

[pawels_at_alison /home/pawels/dvm.2008.07-dn8k/sources]$ svn di Project

Property changes on: Project
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/sources/Project:r11239

[pawels_at_alison /home/pawels/dvm.2008.07-dn8k/sources]$ svn pl -v Project
Properties on 'Project':
  svn:mergeinfo : /trunk/sources/Project:10512,11239

at this point i don't understand why the merge add info
about 11239 to existing Project's info. is it a bug or a feature?

thanks in advance for any hints.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=978899

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2008-12-03 15:14:49 CET