[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r25134 - in trunk/subversion: libsvn_client tests/cmdline

From: Joe Swatosh <joe.swatosh_at_gmail.com>
Date: 2007-07-12 01:25:55 CEST

Hi Paul,

On 7/2/07, Paul Burba <pburba@collab.net> wrote:

> >
>

>
> Thanks for the script, that makes things clearer. But I need to point
> out that the failure you described in the Ruby test, specifically the
> "Out of date" error...
>
> > ============
> > The test fails on the
> > rev6 = ctx.commit(@wc_path).revision
> > line with the following
> > ============
> > 1) Error:
> > test_merge(SvnClientTest):
> > Svn::Error::FsTxnOutOfDate:
> > D:\SVN\src-trunk\subversion\libsvn_client\commit.c:871 Commit failed
> (details follow):
> > Out of date: '/trunk' in transaction '5-1'
> > D:/SVN/src-trunk/subversion/bindings/swig/ruby/svn/util.rb:86:in
> > `svn_client_commit4'
> > D:/SVN/src-trunk/subversion/bindings/swig/ruby/svn/util.rb:86:in
> `commit4'
> >
> D:/SVN/src-trunk/subversion/bindings/swig/ruby/svn/client.rb:122:in
> `commit'
> >
> D:/SVN/src-trunk/subversion/bindings/swig/ruby/test\test_client.rb:875:i
> n
> > `test_merge'
> > ============
>
> ...Is not the same "error" produced by the script. Not surprising,
> since the script and the Ruby test differ somewhat:
>
> ...
> ctx.propdel("svn:mergeinfo", trunk) <-- The script doesn't do anything
> like this
> ...

Duh. I skipped that because I misread the revert further down in the test as
reverting the whole directory.

>

>
> So the merge results in local modifications on 'wc\trunk\sample.txt' and
> 'wc\trunk', but you only revert 'wc\trunk\sample.txt'. So there is
> still a local mod lurking after the revert:
>
> C:\SVN\WC\JS_REPRODUCTION_TRUNK>svn st wc
> M wc\trunk
>

>
> Now as long as 'wc\trunk' has the svn:mergeinfo '/branch:2,4', you can
> try any way you like to merge -c4 into trunk, but it's always a no-op
> (at least for r4) so this is the correct behavior. Does that make
> sense?
>

Yes. At long last you've got though to me.

>
> Does this make sense or make things worse?
>
> Paul
>

Much better. Now I just have to decide what to do about the tests.

--
Joe
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 12 01:25:43 2007

This is an archived mail posted to the Subversion Dev mailing list.