You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Christian Schaffner <ch...@users.sourceforge.net> on 2005/03/23 10:35:25 UTC

Problem committing changed svn:ignore with -N option

Dear Subversion Community


I found a reproducible problem with committing a changed svn:ignore  
property using the -N option. Here is the transcript:


$ svn pe svn:ignore .
Set new value for property 'svn:ignore' on '.'


$ svn status -u
M            1110   dir/Thirdfile
  M           1110   .
Status against revision:   1110


$ svn diff .

Property changes on:
___________________________________________________________________
Name: svn:ignore
    + somefile.*
otherfile.ext


Index: dir/Thirdfile
===================================================================
--- dir/Thirdfile        (revision 1110)
+++ dir/Thirdfile        (working copy)
@@ -112,7 +112,7 @@
  line1
  line2
  line3
-line4_old
+line4_new
  line5
  line6
  line7



So, until now everything seems ok. I don't want to commit the  
dir/Thirdfile yet, so I do:


$ svn ci -N .
Sending        .
svn: Commit succeeded, but other errors follow:
svn: Error bumping revisions post-commit (details follow):
svn: In directory  
'/private/Network/Servers/ourserver/Users/username/path/to/src'
svn: Error processing command 'committed' in  
'/private/Network/Servers/ourserver/Users/username/path/to/src'
svn: Can't move  
'/private/Network/Servers/ourserver/Users/username/path/to/src/.svn/ 
tmp/dir-props' to  
'/private/Network/Servers/ourserver/Users/username/path/to/src/.svn/ 
dir-prop-base': File exists
svn: Your commit message was left in a temporary file:
svn:     
'/private/Network/Servers/ourserver/Users/username/path/to/src/svn- 
commit.tmp'


Which seems to not work... Mhmm... Then i do:


$ svn status
?      svn-commit.tmp
  ML    .
   L    dir
M      dir/Thirdfile


Ok, so I try cleanup, which fails too:

$ svn cleanup
svn: In directory ''
svn: Error processing command 'committed' in ''
svn: Can't move '.svn/tmp/dir-props' to '.svn/dir-prop-base': File  
exists


The repository is sitting on a web dav server, using an URL like:
https://our.server.com/path/to/repos
and using FSFS.

So, am I doing something wrong here? And, can I fix my working copy?  
Thanks for any hints/help!


Chris.



My System:
svn client installed from Fink.

$ svn --version
svn, version 1.1.3 (r12730)
    compiled Feb 21 2005, 11:31:12

Copyright (C) 2000-2004 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
This product includes software developed by CollabNet  
(http://www.Collab.Net/).

The following repository access (RA) modules are available:

* ra_dav : Module for accessing a repository via WebDAV (DeltaV)  
protocol.
   - handles 'http' schema
   - handles 'https' schema
* ra_local : Module for accessing a repository on local disk.
   - handles 'file' schema
* ra_svn : Module for accessing a repository using the svn network  
protocol.
   - handles 'svn' schema


$ sw_vers
ProductName:    Mac OS X
ProductVersion: 10.3.7
BuildVersion:   7S215



---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org