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

Error on commit

From: John Rousseau <JRousseau_at_novell.com>
Date: 2004-08-21 06:13:36 CEST

Client: svn, version 1.0.6 (r10360) (Win XP)
Server: svn, version 1.0.6 (dev build) (SuSE 9.1)

I just did a fairly large merge (~80 files) from one branch to the branch picked up by my working copy. My working copy was consistent and updated prior to the merge. The merge seemed to work fine. After fixing the conflicts, I wanted to commit my change. "svn status" had no conflicted files. Here's the commit that followed:

[shock]:W:/edev> svn commit -m "Merge of branches/prototype:90 to branches/jrr_masala_1"
Sending build\checkstyle_checks.xml
Sending build\classpath.txt
Adding tests\src\com\novell\soa\spi\base\TestSubsystemControllerBase.java
Adding tests\src\com\novell\soa\spi\core
Transmitting file data .............................................................svn: Commit succeeded, but other errors follow:
svn: Error bumping revisions post-commit (details follow):

That's it. No details followed.

There was nothing in the apache error log. The new revision seems to be in the repo, but my working copy still has a lot of "stuff" in it:

[shock]:W:/edev> svn status
  M tests\src\com\novell\soa\impl\portal\portlet\PortletApplicationTestImpl.java
  M tests\src\com\novell\soa\impl\portal\portlet\PortletRequestTestImpl.java
  M tests\src\com\novell\soa\impl\portal\portlet\PortletResponseTestImpl.java
  M tests\src\com\novell\soa\impl\portal\portlet\TestParameterHolder.java
  M tests\src\com\novell\soa\impl\portal\portlet\TestPortletURLImpl.java
A + tests\src\com\novell\soa\impl\core
A + tests\src\com\novell\soa\impl\core\ManualTests.java
A + tests\src\com\novell\soa\impl\core\TestPropertiesBootstrapConfigImpl.java
A + tests\src\com\novell\soa\impl\core\TestDefaultRuntimeFactoryImpl.java
A + tests\src\com\novell\soa\impl\core\DummyConfigBean.java
[... on and on...]

I don't want to update or do anything in case there's some post-mortem I can do here.

Thanks for any help!

John Rousseau                               JRousseau@novell.com
Novell, Inc.                               http://www.novell.com
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Aug 21 06:14:01 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.