On Mon, May 12, 2003 at 08:38:14AM -0500, kfogel@collab.net wrote:
> Michael Wood <mwood@its.uct.ac.za> writes:
> > Maybe Marko has some thoughts on this. I remember him mentioning this
> > problem in an e-mail or in the code or somewhere.
>
> Hmm, I doubt it -- the code in which the error happens is new.
I just meant that Marko has thought about these things before.
I've just found what I was probably thinking of. From
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgId=231982:
[...]
+ print "+" * 72
+ for timestamp, digest, op, f, r, br, tags, branches in self.deletes:
+ rel_name = relative_name(ctx.cvsroot, f[:-2])
+ repos_path = branch_path(ctx, br) + rel_name
+ print ' deleting %s : %s' % (r, repos_path)
+
+ if r == "1.1":
+ continue
+ # If the file was initially added on a branch, the first mainline
+ # revision will be marked dead, and thus, attempts to delete it will
+ # fail, since it doesn't really exist.
+ del repo_state[br][rel_name]
[...]
Then in
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgId=215586
there is this:
[...]
@@ -493,7 +524,8 @@
# If the file was initially added on a branch, the first mainline
# revision will be marked dead, and thus, attempts to delete it will
# fail, since it doesn't really exist.
- if r != '1.1':
+ #if r != '1.1':
+ if fs.check_path(root, repos_path, f_pool) != util.svn_node_none:
### need to discriminate between OS paths and FS paths
fs.delete(root, repos_path, f_pool)
[...]
--
Michael Wood <mwood@its.uct.ac.za>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon May 12 17:30:12 2003