commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Shahaf <...@daniel.shahaf.name>
Subject Re: [math] Strange svn conflict
Date Wed, 28 Dec 2011 14:11:01 GMT
Sébastien Brisard wrote on Tue, Dec 27, 2011 at 21:39:52 +0100:
> >> Should I move to svn 1.7 ?
> >>
> >
> > You could try moving to 1.7, and/or using the official JavaHL bindings
> > instead of the third-party SVNKit implementation.  With my svn hat on,
> > though, I'd like to figure out how those revisions with bogus 'log -qv'
> > output were created, and if you have the time to provide a self-contained
> > reproduction recipe (starting with 'svnadmin create', and svn and/or
> > eclipse) we'd appreciate it.
> >
> I'll try my best to do that.
> 

Thanks.

Sébastien Brisard wrote on Tue, Dec 27, 2011 at 21:41:59 +0100:
> Hi,
> 
> Le 27 décembre 2011 14:06, Daniel Shahaf <d.s@daniel.shahaf.name> a écrit :
> >> > - How to reproduce the errors you saw?  Can you show the output of `svn
> >> >  diff` at the time of a failed commit attempt?
> >> >
> >> I hope this mailing list allows for attachements, in which case you
> >> will find attached the patch I've been trying to commit for several
> >> days now. It is a rather large patch, but I don't think that this is
> >> the cause for our current troubles, since I've tried to commit only a
> >> small piece and it did not work either.
> >>
> >> Just to be sure the trouble was still occuring, I've just tried to
> >> commit these changes, and here is what I get.
> >>
> >> org.tigris.subversion.javahl.ClientException: Merge conflict during commit
> >
> > (this is a server-side error SVN_ERR_FS_CONFLICT; it has nothing to do
> > with 'svn merge')
> >
> >> svn: Commit failed (details follow):
> >> svn: File or directory
> >> 'main/java/org/apache/commons/math/distribution/BinomialDistribution.java'
> >> is out of date; try updating
> >> svn: resource out of date; try updating
> >
> > You probably recognize this error as the one meaning 'run "svn update"
> > and try the commit again.  ("update" needs to be run on the containing
> > directory, not only on the files in question.)'  However, you remarked
> > earlier that you also get this error if you 'rm -rf' your working copy
> > and try to commit from a new one, right?
> >
> 
> That's correct. I did update on the directory, as well as checkout a
> brand new working copy of Commons-Math.
> Was the attached patch of any use to you?

Yes, I saw that it contained only text changes (no property changes or
adds/renames/deletes), so I figured my earlier two test commits
constituted sufficient coverage.

Can you isolate the following factors:

- Size of the patch.  Can you commit a smaller patch --- that touches
  all the same files your patch does?  A smaller patch that touches
  other files?

- Client.  Can you reproduce the errors using (a) eclipse with SVNKit,
  (b) eclipse with Subversion's official JavaHL bindings, (c) the
  cmdline client?

- Server.  Does the error reproduce if you check out your working copy
  from svn-master.apache.org?  (If you literally check out from
  https://svn-master.apache.org/repos/asf/... you'll get SSL warnings;
  you can either bypass them or set 
  # 140.211.11.4	svn.apache.org
  in your /etc/hosts file)

> Sébastien

Daniel
(my r1223004:r1223005 commits were of a one-line patch using 1.7.0 of
the cmdline client via the EU mirror; so perhaps start by ruling out
SVNKit and the N-4 files my test commits didn't touch)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org


Mime
View raw message