Kathey Marsden (JIRA) wrote:
[ http://issues.apache.org/jira/browse/DERBY-522?page=comments#action_12332304 ]
Kathey Marsden commented on DERBY-522:
--------------------------------------
Committed this to the trunk: Please submit the merge command for merge to 10.1
when ready.
I tried running the merge command against 10.1 but it fails with an error when
it attempts to add the new master files to the repository:
svn merge -r 325992:325993 https://svn.apache.org/repos/asf/db/derby/code/trunk
svn: Access schema mixtures not yet supported
('https://svn.apache.org/repos/asf/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/nullSQLText.out'
and
'http://svn.apache.org/repos/asf/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet')
If I specify the "--dry-run" argument things will work--i.e. svn knows what it's
_supposed_ to do--but when it comes time to actually do the merge, it fails.
Has anyone successfully merged (from one branch to another) a change that adds
new files to the repository? If so, what's the trick to doing so?
If it's not possible to do so, then what's the correct approach here? Is it up
to the committer to create the new files and "svn add" them before running the
merge command? I tried that and it seems to have worked:
touch
'java\testing\org\apache\derbyTesting\functionTests\master\DerbyNet\nullSQLText.out'
svn add
'java\testing\org\apache\derbyTesting\functionTests\master\DerbyNet\nullSQLText.out'
touch
'java\testing\org\apache\derbyTesting\functionTests\master\DerbyNetClient\nullSQLText.out'
svn add
'java\testing\org\apache\derbyTesting\functionTests\master\DerbyNetClient\nullSQLText.out'
svn merge -r 325992:325993 https://svn.apache.org/repos/asf/db/derby/code/trunk
Is that acceptable? If not, what are my alternatives?
Army
