db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Deepa Remesh <drem...@gmail.com>
Subject Re: [jira] Commented: (DERBY-522) ERROR X0Y79 raised when adding comments using "--" before sql queries with Network Client
Date Tue, 18 Oct 2005 18:06:05 GMT
Hi Army,

I have merged a patch which adds new files (DERBY-518). I did not have
any problems. So I just tried your merge command and it worked for me.
Here is the output I get:

------------------------------------------------------
C:\deepa\Derby\derby_src\10.1>svn merge -r 325992:325993
https://svn.apache.org/repos/asf/db/derby/code/trunk
U    java\tools\org\apache\derby\impl\tools\ij\ij.jj
U    java\engine\org\apache\derby\impl\sql\compile\sqlgrammar.jj
U    java\testing\org\apache\derbyTesting\functionTests\tests\jdbcapi\nullSQLText.java
A    java\testing\org\apache\derbyTesting\functionTests\master\DerbyNet\nullSQLText.out
U    java\testing\org\apache\derbyTesting\functionTests\master\DerbyNetClient\syscat.out
U    java\testing\org\apache\derbyTesting\functionTests\master\DerbyNetClient\forupdate.out
A    java\testing\org\apache\derbyTesting\functionTests\master\DerbyNetClient\nullSQLText.out
U    java\testing\org\apache\derbyTesting\functionTests\master\nullSQLText.out
U    java\client\org\apache\derby\client\am\Statement.java
------------------------------------------------------

Deepa


On 10/18/05, Army <qozinx@sbcglobal.net> wrote:
> 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
>
>

Mime
View raw message