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

Crash in 1.4 with "svn commit -N . something"

From: Nicolás Lichtmaier <nick_at_reloco.com.ar>
Date: 2006-06-21 04:32:07 CEST

Running HEAD from the 1.4 branch I've got a crash when doing "svn commit
-N . something". It doesn't handle the case of "." being commited! I've
attached a patch for this, but this is probably not a solution: now it
tries to lock '.' twice. I don't know much about subversion to properly
fix this, perhaps when iterating over the targets it should check if a
path has already been locked... Anyway, with my patch at least it
doesn't crash =).

[[[
Fix for a crash when commiting the current directory (although a bug still
remains).

* subversion/libsvn_client/commit.c (svn_client_commit3): If target
  already is at base_dir, svn_path_split will get us past it. Better
  to skip the parent traversal if target is equal to base_dir.
  It doesn't fix the bug, now it exits with 'Working copy
  '/home/nick/src/subview' locked'
]]]

Index: subversion/libsvn_client/commit.c
===================================================================
--- subversion/libsvn_client/commit.c (revisión: 20204)
+++ subversion/libsvn_client/commit.c (copia de trabajo)
@@ -1292,6 +1292,9 @@
                                const char *) = apr_pstrdup(pool, target);
             }
 
+ if (!strcmp(base_dir, target))
+ continue;
+
           /* Now we need to iterate over the parent paths of this path
              adding them to the set of directories we want to lock. */
           svn_path_split(target, &parent_dir, &name, subpool);

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jun 21 04:33:01 2006

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