top button
Flag Notify
    Connect to us
      Site Registration

Site Registration

SVN commit line ending handling

+1 vote

I periodically receive this kind of errors -

X:>svn commit -m "BLA BLA" itextsharp.dll iTextSharp.xml
Sending iTextSharp.xml
Sending itextsharp.dll
Transmitting file data ..
svn: E135000: Commit failed (details follow):
svn: E135000: While preparing 'iTextSharp.xml' for commit
svn: E135000: Inconsistent line ending style
svn: E720032: Additional errors:
svn: E720032: Transaction '1718-1ca' cleanup failed
svn: E720032: Can't remove file 'Depotdbtxn-protorevs1718-1ca.rev': The process cannot access the file because it is being used by another process.

Question 1: Is there a way to have SVN normalize line ending on commit by itself?
Question 2: Why txn-protorevs aren't being cleaned up properly?

posted Aug 31, 2013 by Bob Wise

Share this question
Facebook Share Button Twitter Share Button LinkedIn Share Button

1 Answer

+1 vote
Question 1: Is there a way to have SVN normalize line ending on commit by itself?

It seems svn:eol-style is set on this file. If you set svn:eol-style on a file (to any supported value), Subversion requires that the file have consistent line endings before you commit it. You or your tools must do this; Subversion will not.

If you do not set svn:eol-style, then Subversion does not check the line endings and lets you commit whatever you want, so if for some reason you want inconsistent line endings then that's how you can have that.

Question 2: Why txn-protorevs aren’t being cleaned up properly?

I don't know what's going on there. Do you have any hook scripts? Maybe one of them is programmed incorrectly.

answer Aug 31, 2013 by anonymous
Similar Questions
+1 vote

We are using Subversion (SVN 1.6.12-r955802).

Since the Apache version 2.2.24 has some security issues (multi-site security issue), we have moved to Apache version 2.2.25. But this updated version has the second commit issue. Issue details are given below.

"The issue with Apache 2.2.25 is when you have 'space' in folder name / file name. The first commit of these files / folders (with space in the name) is successful. We are facing issue only when subsequent commit is happening. We are using Tortoise SVN as client"

+1 vote

I have the following setup "trunk and branch A (created from trunk)"

Now, what I want to do is only commit my changes to the trunk and make sure that every committed change is replicated into branch A. This should be an automatic commit, triggered by the commit to trunk, while being aware of the fact that no other changes should be done in branch A but the autocommit from trunk.

Another "would-like" requirement is that the commit metadata like author and commit time/date are kept, but this is not a must have. Is that possible with svn, maybe with autocommit hooks? If not, what other way would you see to achieve that?

0 votes

We have an svn repository with several branches and tags.

- trunk/
- branches/
 - stable_1
 - stable_2
 - etc.
- tags/
 - stable_1_release_a
 - stable_1_release_b
 - etc.

We develop our software in trunk (or in a development branch which will be reintegrated to trunk). We merge the changes from trunk to a stable branch. Sometimes we discover a bug which has been introduced quite some time ago. Because the list of branches becomes quite long, I would like to know if it is possible to easily see in which branches / tags the bug is?
So if for instance the bug was introduced in r50 in trunk and currently we are at r100, is there an svn command to see which branches / tags have r50 of trunk merged?

+1 vote

My most recent commit was the creation of a tag. I want to delete that tag. Should I reverse merge the commit or simply delete the tag?

If I do a reverse merge I see a tree conflict:

C:>svn merge -c -69  

--- Reverse-merging r69 into '.': 

 C tagsTAG_ 

--- Recording mergeinfo for reverse merge of r69 into '.': 

U . 

Tree conflict on 'tagsTAG_ 

 > local dir edit, incoming dir delete upon merge 

Select: (r) mark resolved, (p) postpone, (q) quit resolution, (h) help: 

What is the best thing to do here?

+1 vote

I see in pre-commit hook template that changing revisions properties in transaction are allowed.But I cant find way for it (I want change svn:author to more readable).

Is here way for this with svn, svnadmin, svnlook ... or other standard tool? Or I should use Subversion API and write simple tool?