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

Re: BUG with complex branching, only over neon and serf

From: Eric Gillespie <epg_at_pretzelnet.org>
Date: 2007-09-12 21:43:21 CEST

Eric Gillespie <epg@pretzelnet.org> writes:

> 1. Delete /trunk/dir1/dir2/
> => commit r13
> 2. In one transaction:
> a. Copy /trunk@13 to /branch
> b. Create /branch/dir1/dir2
> => commit r14
> 3. In one transaction:
> a. Delete /branch
> b. Copy /trunk@13 to /branch
> c. Create /branch/dir1/dir2
> => ERROR: .../branch/dir1/dir2 already exists

I thought it might be the check_path in
mod_dav_svn/repos.c:open_stream, but I added this block just
before the branch 2 operation to test the theory:

    txn = fs.begin_txn(self.fs, head)
    txnroot = fs.txn_root(txn)
    fs.delete(txnroot, 'branch')
    copyfrom_root = fs.revision_root(self.fs, copyfrom_rev)
    fs.copy(copyfrom_root, 'trunk', txnroot, 'branch')
    print 'hrm', fs.check_path(txnroot, 'branch/dir1/dir2')
    fs.make_file(txnroot, 'branch/dir1/dir2')
    fs.close_root(txnroot)
    (conflicts, head) = fs.commit_txn(txn)
    print '***', conflicts, head
    fs.close_root(copyfrom_root)

It worked, so I don't think it's the check_path. Hrm.

-- 
Eric Gillespie <*> epg@pretzelnet.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Sep 12 23:54:17 2007

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