Hi *,
using subversion 1.5.5
merging a tree using svn merge --accept postpone <url>
path-to-working-copy did result in some conflicts in metadata
svn did generate a file.prej file in that case with the following content:
Trying to delete property 'svn:mergeinfo' with value
'/cws/accelerators01svn/solenv/bin/modules/CwsConfig.pm:262088-264611
/cws/cairosource01/solenv/bin/modules/CwsConfig.pm:261927-264567
/cws/dba31e/solenv/bin/modules/CwsConfig.pm:261927-264588
/cws/extmgrui06/solenv/bin/modules/CwsConfig.pm:261927-263727
/cws/koheidatapilot02/solenv/bin/modules/CwsConfig.pm:261978-264492
/cws/qascripts03/solenv/bin/modules/CwsConfig.pm:264326-264620
/cws/socs21/solenv/bin/modules/CwsConfig.pm:262621-264613
/cws/sqlsyntaxhighlighting/solenv/bin/modules/CwsConfig.pm:261927-264539
/cws/tbo03/solenv/bin/modules/CwsConfig.pm:262088-264360
/cws/vcl96/solenv/bin/modules/CwsConfig.pm:262088-264607
/tags/DEV300_m32/solenv/bin/modules/CwsConfig.pm:261926-261977
/tags/DEV300_m37/solenv/bin/modules/CwsConfig.pm:264807-264906
/trunk/solenv/bin/modules/CwsConfig.pm:2-82515,261927-264806'
but the local value is
'/cws/accelerators01svn/solenv/bin/modules/CwsConfig.pm:262088-264611
/cws/cairosource01/solenv/bin/modules/CwsConfig.pm:261927-264567
/cws/dba31e/solenv/bin/modules/CwsConfig.pm:261927-264588
/cws/extmgrui06/solenv/bin/modules/CwsConfig.pm:261927-263727
/cws/koheidatapilot02/solenv/bin/modules/CwsConfig.pm:261978-264492
/cws/qascripts03/solenv/bin/modules/CwsConfig.pm:264326-264620
/cws/socs21/solenv/bin/modules/CwsConfig.pm:262621-264613
/cws/sqlsyntaxhighlighting/solenv/bin/modules/CwsConfig.pm:261927-264539
/cws/tbo03/solenv/bin/modules/CwsConfig.pm:262088-264360
/cws/vcl96/solenv/bin/modules/CwsConfig.pm:262088-264607
/tags/DEV300_m32/solenv/bin/modules/CwsConfig.pm:261926-261977
/tags/DEV300_m37/solenv/bin/modules/CwsConfig.pm:264807-264906
/trunk/solenv/bin/modules/CwsConfig.pm:2-82515,261927-264806'.
Note that the list of entries hat it tried to delete is the same as
the local value list - at least that is what that file claims, however
using svn propget svn:mergeinfo on the affected file in the
working-copy shows the following:
/cws/accelerators01svn/solenv/bin/modules/CwsConfig.pm:262088-264611
/cws/cairosource01/solenv/bin/modules/CwsConfig.pm:261927-264567
/cws/dba31e/solenv/bin/modules/CwsConfig.pm:261927-264588
/cws/extmgrui06/solenv/bin/modules/CwsConfig.pm:261927-263727
/cws/koheidatapilot02/solenv/bin/modules/CwsConfig.pm:261978-264492
/cws/qascripts03/solenv/bin/modules/CwsConfig.pm:264326-264620
/cws/socs21/solenv/bin/modules/CwsConfig.pm:262621-264613
/cws/sqlsyntaxhighlighting/solenv/bin/modules/CwsConfig.pm:261927-264539
/cws/tbo03/solenv/bin/modules/CwsConfig.pm:262088-264360
/cws/vcl96/solenv/bin/modules/CwsConfig.pm:262088-264607
/tags/DEV300_m32/solenv/bin/modules/CwsConfig.pm:261926-261977
/tags/DEV300_m37/solenv/bin/modules/CwsConfig.pm:264807-264906
/tags/DEV300_m40/solenv/bin/modules/CwsConfig.pm:266943-267625
/trunk/solenv/bin/modules/CwsConfig.pm:2-82515,261927-264806
Notice the additional line with DEV300_m40 (second from the bottom)
Thus my conclusion is: svn prints the same list twice into the prej
file, instead of one time the expected list, and one time the actual
value(s)
ciao
Christian
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1140821
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-11 22:25:32 CET