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

Re: Mergeinfo overwritten from successive merges

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Fri, 14 Mar 2014 17:02:47 +0000

Philip Martin <philip.martin_at_wandisco.com> writes:

> PROPPATCH /obj/repo/!svn/txr/4-4/B HTTP/1.1\r

So the PROPPATCH is on the 'txr' (transaction root) URL.

> X-SVN-Version-Name: 3\r

and this is the baseline revision in the working copy

> It seems that the do_out_of_date_check is not working properly:

do_out_of_date_check does

  /* Do an out-of-dateness check. */
  if ((serr = svn_fs_node_created_rev(&created_rev, comb->priv.root.root,
                                      comb->priv.repos_path, r->pool)))

comb->priv.root is the transaction root

(gdb) p comb->priv.root
$16 = {root = 0x7f8111da55b0, rev = -1, activity_id = 0x0,
  txn_name = 0x7f8111ce3518 "4-4", vtxn_name = 0x0, txn = 0x7f8111ce35f0}

and svn_fs_node_created_rev is documented to return SVN_INVALID_REVNUM
for mutable paths in a transaction. In this case the path is mutable
because we have already processed some of changes that make up the
merge.

-- 
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*
Received on 2014-03-14 18:03:26 CET

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